cpp/openttd-patchpack/source Changeset - r17638:b5cd61522302

Changeset - r17638:b5cd61522302

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 13 years ago 2011-05-04 17:15:54
frosch@openttd.org

(svn r22420) -Cleanup: Replace the somewhat mixed DOS+Windows palette with the pure DOS palette. Also blank the animation colours, which are filled from a different array anyway.

1 file changed with 23 insertions and 13 deletions:

src/table/palettes.h

0 comments (0 inline, 0 general)

src/table/palettes.h

➞

Show inline comments

@@ @@ -13,10 +13,14 @@ @@
 #define M(r, g, b) { 0xff << 24 | (r) << 16 | (g) << 8 | (b) }
 /** Colour palette (DOS) */
 static const Colour _palette[256] = {
 	/* mixed TTD DOS + TTD Windows palette */
 		{             0}, M( 16,  16,  16), M( 32,  32,  32), M( 48,  48,  48),
 		/* transparent */
 		{             0},
 		/* grey scale */
 		                  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),
 		/* regular colours */
 		M(131, 133, 131), M(148, 149, 148), 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),
@@ @@ -41,7 +45,7 @@ static const Colour _palette[256] = { @@
 		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( 72,  40,   0), M( 88,  52,  12),
+		M( 32,  24,   0), M( 56,  28,   0), M( 72,  40,   4), 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),
@@ @@ -68,17 +72,23 @@ static const Colour _palette[256] = { @@
 		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(180, 220, 236), M(132, 188, 216), M( 88, 152, 172),
 		/* unused pink */
 		                                                      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(212,   0, 212), M(212,   0, 212), M(212,   0, 212),
 		/* Palette animated colours (filled with data from #ExtraPaletteValues) */
 		                                                      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( 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)
 		M(  0,   0,   0), M(  0,   0,   0), M(  0,   0,   0), M(  0,   0,   0),
 		M(  0,   0,   0), M(  0,   0,   0), M(  0,   0,   0), M(  0,   0,   0),
 		M(  0,   0,   0), M(  0,   0,   0), M(  0,   0,   0), M(  0,   0,   0),
 		M(  0,   0,   0), M(  0,   0,   0), M(  0,   0,   0), M(  0,   0,   0),
 		M(  0,   0,   0), M(  0,   0,   0), M(  0,   0,   0), M(  0,   0,   0),
 		M(  0,   0,   0), M(  0,   0,   0), M(  0,   0,   0),
 		/* pure white */
 		                                                      M(252, 252, 252)
 };
 /** Description of the length of the palette cycle animations */

0 comments (0 inline, 0 general)