diff options
author | rubidium <rubidium@openttd.org> | 2008-08-23 20:16:54 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2008-08-23 20:16:54 +0000 |
commit | 07c20252c3614e6758943817811277e8e6e7c95b (patch) | |
tree | 5286eef504f7700e89f70f223dd516dc542ba066 /src/table/palettes.h | |
parent | 4335c272182c2fdde399a3f9158bbd6262f96ed5 (diff) | |
download | openttd-07c20252c3614e6758943817811277e8e6e7c95b.tar.xz |
(svn r14146) -Codechange: allow palette override in both ways and remove some unneeded '(x == 0) ? 0 : 1' constructs.
Diffstat (limited to 'src/table/palettes.h')
-rw-r--r-- | src/table/palettes.h | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/src/table/palettes.h b/src/table/palettes.h index 794d2d1e7..d129f4191 100644 --- a/src/table/palettes.h +++ b/src/table/palettes.h @@ -11,19 +11,19 @@ #endif /* TTD_ENDIAN == TTD_BIG_ENDIAN */ static const Colour _palettes[][256] = { - /* palette 1 (TTD Windows) */ + /* palette 0 (mixed TTD DOS + TTD Windows palette */ { - { 0, 0, 0, 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), + { 0, 0, 0, 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), 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( 72, 44, 4), M( 88, 60, 20), 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( 64, 0, 4), 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), @@ -35,11 +35,11 @@ static const Colour _palettes[][256] = { 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( 28, 52, 24), 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( 32, 24, 0), M( 56, 28, 0), M( 72, 40, 0), 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), @@ -47,7 +47,7 @@ static const Colour _palettes[][256] = { 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( 40, 20, 112), 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), @@ -74,24 +74,24 @@ static const Colour _palettes[][256] = { 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) + 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 2 (mixed TTD DOS + TTD Windows palette */ + /* palette 1 (TTD Windows) */ { - { 0, 0, 0, 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), + { 0, 0, 0, 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( 72, 44, 4), M( 88, 60, 20), M(104, 80, 44), M(124, 104, 72), + 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( 64, 0, 4), M( 88, 4, 16), M(112, 16, 32), M(136, 32, 52), + 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), @@ -103,11 +103,11 @@ static const Colour _palettes[][256] = { 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( 28, 52, 24), M( 44, 68, 32), M( 60, 88, 48), M( 80, 104, 60), + 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( 72, 40, 0), M( 88, 52, 12), + 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), @@ -115,7 +115,7 @@ static const Colour _palettes[][256] = { 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( 40, 20, 112), M( 64, 44, 144), M( 88, 64, 172), M(104, 76, 196), + 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), @@ -142,9 +142,9 @@ static const Colour _palettes[][256] = { 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(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) } }; @@ -201,25 +201,6 @@ struct StringColor { }; static const StringColor _string_colormap[][17] = { - { /* Windows palette. */ - { 150, 215 }, // TC_BLUE - { 12, 215 }, // TC_SILVER - { 189, 215 }, // TC_GOLD - { 184, 215 }, // TC_RED - { 174, 215 }, // TC_PURPLE - { 30, 215 }, // TC_LIGHT_BROWN - { 195, 215 }, // TC_ORANGE - { 209, 215 }, // TC_GREEN - { 68, 215 }, // TC_YELLOW - { 95, 215 }, // TC_DARK_GREEN - { 79, 215 }, // TC_CREAM - { 116, 215 }, // TC_BROWN - { 15, 215 }, // TC_WHITE - { 152, 215 }, // TC_LIGHT_BLUE - { 32, 215 }, // TC_GREY - { 133, 215 }, // TC_DARK_BLUE - { 215, 0 }, // TC_BLACK - }, { /* DOS palette. */ { 150, 1 }, // TC_BLUE { 12, 1 }, // TC_SILVER @@ -238,5 +219,24 @@ static const StringColor _string_colormap[][17] = { { 6, 1 }, // TC_GREY { 133, 1 }, // TC_DARK_BLUE { 1, 0 }, // TC_BLACK + }, + { /* Windows palette. */ + { 150, 215 }, // TC_BLUE + { 12, 215 }, // TC_SILVER + { 189, 215 }, // TC_GOLD + { 184, 215 }, // TC_RED + { 174, 215 }, // TC_PURPLE + { 30, 215 }, // TC_LIGHT_BROWN + { 195, 215 }, // TC_ORANGE + { 209, 215 }, // TC_GREEN + { 68, 215 }, // TC_YELLOW + { 95, 215 }, // TC_DARK_GREEN + { 79, 215 }, // TC_CREAM + { 116, 215 }, // TC_BROWN + { 15, 215 }, // TC_WHITE + { 152, 215 }, // TC_LIGHT_BLUE + { 32, 215 }, // TC_GREY + { 133, 215 }, // TC_DARK_BLUE + { 215, 0 }, // TC_BLACK } }; |