diff --git a/OpenRa.Game/Graphics/HardwarePalette.cs b/OpenRa.Game/Graphics/HardwarePalette.cs index 0a4fdfa81e..9c0538e61f 100644 --- a/OpenRa.Game/Graphics/HardwarePalette.cs +++ b/OpenRa.Game/Graphics/HardwarePalette.cs @@ -3,12 +3,12 @@ using OpenRa.FileFormats; namespace OpenRa.Game.Graphics { + public enum PaletteType { Gold, Blue, Red, Orange, Teal, Salmon, Green, Gray, Shadow, Invuln, Chrome }; class HardwarePalette : Sheet { - const int maxEntries = 16; int allocated = 0; - //Note: addPalette calls should match the ordering in PaletteType.cs + public HardwarePalette(Renderer renderer, Map map) : base(renderer,new Size(256, maxEntries)) { diff --git a/OpenRa.Game/Graphics/PaletteType.cs b/OpenRa.Game/Graphics/PaletteType.cs deleted file mode 100644 index 164347fa6f..0000000000 --- a/OpenRa.Game/Graphics/PaletteType.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace OpenRa.Game.Graphics -{ - //Note: should match the ordering in HardwarePalette.cs - enum PaletteType { Gold, Blue, Red, Orange, Teal, Salmon, Green, Gray, Shadow, Invuln, Chrome }; -} diff --git a/OpenRa.Game/OpenRa.Game.csproj b/OpenRa.Game/OpenRa.Game.csproj index 08323a944b..8c23fce9d4 100644 --- a/OpenRa.Game/OpenRa.Game.csproj +++ b/OpenRa.Game/OpenRa.Game.csproj @@ -92,7 +92,6 @@ -