diff options
| author | smatz <smatz@openttd.org> | 2009-06-22 23:15:27 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-06-22 23:15:27 +0000 |
| commit | d703f0c3b527f1c1f324875762293929c6fbb932 (patch) | |
| tree | ff1d89bd4abc675ae5dfe258ec16363ac529b920 /src/table | |
| parent | 4f0e62deb63afa2019c0e2d1d2ea4ca552743998 (diff) | |
| download | openttd-d703f0c3b527f1c1f324875762293929c6fbb932.tar.xz | |
(svn r16628) -Codechange: remove one gcc2 hack
Diffstat (limited to 'src/table')
| -rw-r--r-- | src/table/palettes.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/table/palettes.h b/src/table/palettes.h index 794b235ef..3207cab9d 100644 --- a/src/table/palettes.h +++ b/src/table/palettes.h @@ -4,16 +4,12 @@ #include "../core/endian_type.hpp" -#if TTD_ENDIAN == TTD_BIG_ENDIAN - #define M(r, g, b) { 0xff, r, g, b } -#else - #define M(r, g, b) { b, g, r, 0xff } -#endif /* TTD_ENDIAN == TTD_BIG_ENDIAN */ +#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 */ { - { 0, 0, 0, 0 }, M( 16, 16, 16), M( 32, 32, 32), M( 48, 48, 48), + { 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), @@ -81,7 +77,7 @@ static const Colour _palettes[][256] = { /* palette 1 (TTD Windows) */ { - { 0, 0, 0, 0 }, M(212, 0, 212), M(212, 0, 212), M(212, 0, 212), + { 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), |