(svn r22419) -Change: Always use the DOS palette for drawing.

-Remove: the '-i' option for palette selection.

2 files changed, 5 insertions, 98 deletions

diff --git a/src/table/palette_convert.h b/src/table/palette_convert.h
index 02f4478f3..863216af0 100644
--- a/src/table/palette_convert.h
+++ b/src/table/palette_convert.h
@@ -10,7 +10,7 @@
 /** @file palette_convert.h Translation tables from one GRF to another GRF. */
 
 /** Converting from the Windows palette to the DOS palette */
-static const byte _palmap_w2d[] = {
+extern const byte _palmap_w2d[] = {
 	  0,   1,   2,   3,   4,   5,   6,   7, //   0..7
 	  8,   9,  10,  11,  12,  13,  14,  15, //   8..15
 	 16,  17,  18,  19,  20,  21,  22,  23, //  16..23
@@ -46,7 +46,7 @@ static const byte _palmap_w2d[] = {
 };
 
 /** Converting from the DOS palette to the Windows palette */
-extern const byte _palmap_d2w[] = {
+static const byte _palmap_d2w[] = {
 	  0, 215, 216, 136,  88, 106,  32,  33, //   0..7
 	 40, 245,  10,  11,  12,  13,  14,  15, //   8..15
 	 16,  17,  18,  19,  20,  21,  22,  23, //  16..23
diff --git a/src/table/palettes.h b/src/table/palettes.h
index 719725a1d..323c5e302 100644
--- a/src/table/palettes.h
+++ b/src/table/palettes.h
@@ -13,9 +13,8 @@
 
 #define M(r, g, b) { 0xff << 24 | (r) << 16 | (g) << 8 | (b) }
 
-static const Colour _palettes[][256] = {
-	/* palette 0 (mixed TTD DOS + TTD Windows palette */
-	{
+static const Colour _palette[256] = {
+	/* mixed TTD DOS + TTD Windows palette */
 		{             0}, M( 16,  16,  16), M( 32,  32,  32), M( 48,  48,  48),
 		M( 65,  64,  65), M( 82,  80,  82), M( 98, 101,  98), M(115, 117, 115),
 		M(131, 133, 131), M(148, 149, 148), M(168, 168, 168), M(184, 184, 184),
@@ -80,79 +79,8 @@ static const Colour _palettes[][256] = {
 		M(252, 228,   0), M(148, 148, 148), M( 16, 101, 115), M( 24, 109, 123),
 		M( 32, 117, 131), M( 41, 125, 139), M( 90, 165, 189), M(115, 182, 197),
 		M(148, 202, 222), M(180, 222, 238), M(222, 246, 255), M(252, 252, 252)
-	},
-
-	/* palette 1 (TTD Windows) */
-	{
-		{             0}, M(212,   0, 212), M(212,   0, 212), M(212,   0, 212),
-		M(212,   0, 212), M(212,   0, 212), M(212,   0, 212), M(212,   0, 212),
-		M(212,   0, 212), M(212,   0, 212), M(168, 168, 168), M(184, 184, 184),
-		M(200, 200, 200), M(216, 216, 216), M(232, 232, 232), M(252, 252, 252),
-		M( 52,  60,  72), M( 68,  76,  92), M( 88,  96, 112), M(108, 116, 132),
-		M(132, 140, 152), M(156, 160, 172), M(176, 184, 196), M(204, 208, 220),
-		M( 48,  44,   4), M( 64,  60,  12), M( 80,  76,  20), M( 96,  92,  28),
-		M(120, 120,  64), M(148, 148, 100), M(176, 176, 132), M(204, 204, 168),
-		M(100, 100, 100), M(116, 116, 116), M(104,  80,  44), M(124, 104,  72),
-		M(152, 132,  92), M(184, 160, 120), M(212, 188, 148), M(244, 220, 176),
-		M(132, 132, 132), M( 88,   4,  16), M(112,  16,  32), M(136,  32,  52),
-		M(160,  56,  76), M(188,  84, 108), M(204, 104, 124), M(220, 132, 144),
-		M(236, 156, 164), M(252, 188, 192), M(252, 212,   0), M(252, 232,  60),
-		M(252, 248, 128), M( 76,  40,   0), M( 96,  60,   8), M(116,  88,  28),
-		M(136, 116,  56), M(156, 136,  80), M(176, 156, 108), M(196, 180, 136),
-		M( 68,  24,   0), M( 96,  44,   4), M(128,  68,   8), M(156,  96,  16),
-		M(184, 120,  24), M(212, 156,  32), M(232, 184,  16), M(252, 212,   0),
-		M(252, 248, 128), M(252, 252, 192), M( 32,   4,   0), M( 64,  20,   8),
-		M( 84,  28,  16), M(108,  44,  28), M(128,  56,  40), M(148,  72,  56),
-		M(168,  92,  76), M(184, 108,  88), M(196, 128, 108), M(212, 148, 128),
-		M(  8,  52,   0), M( 16,  64,   0), M( 32,  80,   4), M( 48,  96,   4),
-		M( 64, 112,  12), M( 84, 132,  20), M(104, 148,  28), M(128, 168,  44),
-		M( 64,  64,  64), M( 44,  68,  32), M( 60,  88,  48), M( 80, 104,  60),
-		M(104, 124,  76), M(128, 148,  92), M(152, 176, 108), M(180, 204, 124),
-		M( 16,  52,  24), M( 32,  72,  44), M( 56,  96,  72), M( 76, 116,  88),
-		M( 96, 136, 108), M(120, 164, 136), M(152, 192, 168), M(184, 220, 200),
-		M( 32,  24,   0), M( 56,  28,   0), M( 80,  80,  80), M( 88,  52,  12),
-		M(104,  64,  24), M(124,  84,  44), M(140, 108,  64), M(160, 128,  88),
-		M( 76,  40,  16), M( 96,  52,  24), M(116,  68,  40), M(136,  84,  56),
-		M(164,  96,  64), M(184, 112,  80), M(204, 128,  96), M(212, 148, 112),
-		M(224, 168, 128), M(236, 188, 148), M( 80,  28,   4), M(100,  40,  20),
-		M(120,  56,  40), M(140,  76,  64), M(160, 100,  96), M(184, 136, 136),
-		M( 36,  40,  68), M( 48,  52,  84), M( 64,  64, 100), M( 80,  80, 116),
-		M(100, 100, 136), M(132, 132, 164), M(172, 172, 192), M(212, 212, 224),
-		M( 48,  48,  48), M( 64,  44, 144), M( 88,  64, 172), M(104,  76, 196),
-		M(120,  88, 224), M(140, 104, 252), M(160, 136, 252), M(188, 168, 252),
-		M(  0,  24, 108), M(  0,  36, 132), M(  0,  52, 160), M(  0,  72, 184),
-		M(  0,  96, 212), M( 24, 120, 220), M( 56, 144, 232), M( 88, 168, 240),
-		M(128, 196, 252), M(188, 224, 252), M( 16,  64,  96), M( 24,  80, 108),
-		M( 40,  96, 120), M( 52, 112, 132), M( 80, 140, 160), M(116, 172, 192),
-		M(156, 204, 220), M(204, 240, 252), M(172,  52,  52), M(212,  52,  52),
-		M(252,  52,  52), M(252, 100,  88), M(252, 144, 124), M(252, 184, 160),
-		M(252, 216, 200), M(252, 244, 236), M( 72,  20, 112), M( 92,  44, 140),
-		M(112,  68, 168), M(140, 100, 196), M(168, 136, 224), M(204, 180, 252),
-		M(204, 180, 252), M(232, 208, 252), M( 60,   0,   0), M( 92,   0,   0),
-		M(128,   0,   0), M(160,   0,   0), M(196,   0,   0), M(224,   0,   0),
-		M(252,   0,   0), M(252,  80,   0), M(252, 108,   0), M(252, 136,   0),
-		M(252, 164,   0), M(252, 192,   0), M(252, 220,   0), M(252, 252,   0),
-		M(204, 136,   8), M(228, 144,   4), M(252, 156,   0), M(252, 176,  48),
-		M(252, 196, 100), M(252, 216, 152), M(  8,  24,  88), M( 12,  36, 104),
-		M( 20,  52, 124), M( 28,  68, 140), M( 40,  92, 164), M( 56, 120, 188),
-		M( 72, 152, 216), M(100, 172, 224), M( 92, 156,  52), M(108, 176,  64),
-		M(124, 200,  76), M(144, 224,  92), M(224, 244, 252), M(204, 240, 252),
-		M(180, 220, 236), M(132, 188, 216), M( 88, 152, 172), M( 16,  16,  16),
-		M( 32,  32,  32), M(  8,  92, 104), M( 16, 100, 112), M( 24, 108, 120),
-		M( 32, 116, 128), M( 44, 124, 140), M( 92, 164, 184), M(116, 180, 196),
-		M(148, 200, 216), M(180, 220, 232), M(216, 244, 252), M(  0,   0,   0),
-		M(  0,   0,   0), M(  0,   0,   0), M(  0,   0,   0), M(  0,   0,   0),
-		M(252,  60,   0), M(252,  80,   0), M(252, 104,   0), M(252, 128,   0),
-		M(252, 148,   0), M(252, 172,   0), M(252, 196,   0), M(252,   0,   0),
-		M(252,   0,   0), M(  0,   0,   0), M(  0,   0,   0), M(  0,   0,   0),
-		M(252, 228,   0), M(148, 148, 148), M(212,   0, 212), M(212,   0, 212),
-		M(212,   0, 212), M(212,   0, 212), M(212,   0, 212), M(212,   0, 212),
-		M(212,   0, 212), M(212,   0, 212), M(212,   0, 212), M(252, 252, 252)
-	}
 };
 
-#define GET_PALETTE(x) _palettes[x]
-
 /** Description of the length of the palette cycle animations */
 static const uint EPV_CYCLES_DARK_WATER    =  5; ///< length of the dark blue water animation
 static const uint EPV_CYCLES_LIGHTHOUSE    =  4; ///< length of the lighthouse/stadium animation
@@ -207,8 +135,7 @@ static const ExtraPaletteValues _extra_palette_values = {
 #undef M
 
 /** Colour mapping for the TextColours. */
-static const byte _string_colourmap[][17] = {
-	{ // DOS palette.
+static const byte _string_colourmap[17] = {
 		150, // TC_BLUE
 		 12, // TC_SILVER
 		189, // TC_GOLD
@@ -226,24 +153,4 @@ static const byte _string_colourmap[][17] = {
 		  6, // TC_GREY
 		133, // TC_DARK_BLUE
 		  1, // TC_BLACK
-	},
-	{ // Windows palette.
-		150, // TC_BLUE
-		 12, // TC_SILVER
-		189, // TC_GOLD
-		184, // TC_RED
-		174, // TC_PURPLE
-		 30, // TC_LIGHT_BROWN
-		195, // TC_ORANGE
-		209, // TC_GREEN
-		 68, // TC_YELLOW
-		 95, // TC_DARK_GREEN
-		 79, // TC_CREAM
-		116, // TC_BROWN
-		 15, // TC_WHITE
-		152, // TC_LIGHT_BLUE
-		 32, // TC_GREY
-		133, // TC_DARK_BLUE
-		215, // TC_BLACK
-	}
 };