diff --git a/OpenRa.Game/Graphics/HardwarePalette.cs b/OpenRa.Game/Graphics/HardwarePalette.cs index 51a95e7bf2..841274dcc8 100644 --- a/OpenRa.Game/Graphics/HardwarePalette.cs +++ b/OpenRa.Game/Graphics/HardwarePalette.cs @@ -9,6 +9,7 @@ namespace OpenRa.Graphics { Gold, Blue, Red, Orange, Teal, Salmon, Green, Gray, Shadow, Invuln, Disabled, Highlight, Shroud, Chrome, + Terrain }; class HardwarePalette : Sheet @@ -19,8 +20,9 @@ namespace OpenRa.Graphics public HardwarePalette(Renderer renderer, Map map) : base(renderer,new Size(256, maxEntries)) { + Palette pal = new Palette(FileSystem.Open(map.Theater + ".pal")); - AddPalette(pal); + AddPalette(pal); // Gold foreach (string remap in new string[] { "blue", "red", "orange", "teal", "salmon", "green", "gray" }) AddPalette(new Palette(pal, new PlayerColorRemap(FileSystem.Open(remap + ".rem")))); @@ -31,6 +33,9 @@ namespace OpenRa.Graphics AddPalette(new Palette(pal, new SingleColorRemap(Color.FromArgb(128, 255, 255, 255)))); // Highlight AddPalette(new Palette(pal, new ShroudPaletteRemap())); // Shroud AddPalette(pal); // Chrome (it's like gold, but we're not going to hax it in palettemods) + + Palette palTerrain = new Palette(FileSystem.Open("temperat_ra.pal")); + AddPalette(palTerrain); // Terrain } int AddPalette(Palette p) diff --git a/OpenRa.Game/Graphics/OverlayRenderer.cs b/OpenRa.Game/Graphics/OverlayRenderer.cs index c1e9b576be..cc9fdd0fc0 100755 --- a/OpenRa.Game/Graphics/OverlayRenderer.cs +++ b/OpenRa.Game/Graphics/OverlayRenderer.cs @@ -61,8 +61,8 @@ namespace OpenRa.Graphics if (Ore.overlayIsFence[o]) spriteIndex = NearbyFences(x, y); else if (Ore.overlayIsOre[o]) spriteIndex = map.MapTiles[x,y].density - 1; else if (Ore.overlayIsGems[o]) spriteIndex = map.MapTiles[x,y].density - 1; - spriteRenderer.DrawSprite(sprites[spriteIndex], - Game.CellSize * (float2)location, 0); + spriteRenderer.DrawSprite(sprites[spriteIndex], + Game.CellSize * (float2)location, PaletteType.Terrain); } } diff --git a/OpenRa.Game/Graphics/TerrainRenderer.cs b/OpenRa.Game/Graphics/TerrainRenderer.cs index d981e746b3..1a558ddb82 100644 --- a/OpenRa.Game/Graphics/TerrainRenderer.cs +++ b/OpenRa.Game/Graphics/TerrainRenderer.cs @@ -34,7 +34,7 @@ namespace OpenRa.Graphics for( int i = map.XOffset ; i < map.XOffset + map.Width; i++ ) { Sprite tile = tileMapping[map.MapTiles[i, j]]; - Util.FastCreateQuad(vertices, indices, Game.CellSize * new float2(i, j), tile, 0, nv, ni, tile.size); + Util.FastCreateQuad(vertices, indices, Game.CellSize * new float2(i, j), tile, (int)PaletteType.Terrain, nv, ni, tile.size); nv += 4; ni += 6; } diff --git a/mods/cnc/overrides.mix b/mods/cnc/overrides.mix index e798663a51..8d227fb2c2 100644 Binary files a/mods/cnc/overrides.mix and b/mods/cnc/overrides.mix differ