mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r14042) -Codechange: Rename some structure members to more obvious names. And add a few comments on the _extra_palette_values array.

release/0.7
belugas 2008-08-11 18:30:52 +00:00
parent 16aac30c66
commit 7f5173bf94
2 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gfx.cpp
View File

@ -1022,7 +1022,7 @@ void DoPaletteAnimations()
memcpy(old_val, d, c * sizeof(*old_val)); memcpy(old_val, d, c * sizeof(*old_val));
/* Dark blue water */ /* Dark blue water */
s = (_settings_game.game_creation.landscape == LT_TOYLAND) ? ev->ac : ev->a; s = (_settings_game.game_creation.landscape == LT_TOYLAND) ? ev->dark_water_TOY : ev->dark_water;
j = EXTR(320, 5); j = EXTR(320, 5);
for (i = 0; i != 5; i++) { for (i = 0; i != 5; i++) {
*d++ = s[j]; *d++ = s[j];
@ -1031,7 +1031,7 @@ void DoPaletteAnimations()
} }
/* Glittery water */ /* Glittery water */
s = (_settings_game.game_creation.landscape == LT_TOYLAND) ? ev->bc : ev->b; s = (_settings_game.game_creation.landscape == LT_TOYLAND) ? ev->glitter_water_TOY : ev->glitter_water;
j = EXTR(128, 15); j = EXTR(128, 15);
for (i = 0; i != 5; i++) { for (i = 0; i != 5; i++) {
*d++ = s[j]; *d++ = s[j];
@ -1039,7 +1039,8 @@ void DoPaletteAnimations()
if (j >= 15) j -= 15; if (j >= 15) j -= 15;
} }
s = ev->e; /* Fizzy Drink bubbles animation */
s = ev->fizzy_drink;
j = EXTR2(512, 5); j = EXTR2(512, 5);
for (i = 0; i != 5; i++) { for (i = 0; i != 5; i++) {
*d++ = s[j]; *d++ = s[j];
@ -1091,7 +1092,7 @@ void DoPaletteAnimations()
/* Animate water for old DOS graphics */ /* Animate water for old DOS graphics */
if (_use_dos_palette) { if (_use_dos_palette) {
/* Dark blue water DOS */ /* Dark blue water DOS */
s = (_settings_game.game_creation.landscape == LT_TOYLAND) ? ev->ac : ev->a; s = (_settings_game.game_creation.landscape == LT_TOYLAND) ? ev->dark_water_TOY : ev->dark_water;
j = EXTR(320, 5); j = EXTR(320, 5);
for (i = 0; i != 5; i++) { for (i = 0; i != 5; i++) {
*d++ = s[j]; *d++ = s[j];
@ -1100,7 +1101,7 @@ void DoPaletteAnimations()
} }
/* Glittery water DOS */ /* Glittery water DOS */
s = (_settings_game.game_creation.landscape == LT_TOYLAND) ? ev->bc : ev->b; s = (_settings_game.game_creation.landscape == LT_TOYLAND) ? ev->glitter_water_TOY : ev->glitter_water;
j = EXTR(128, 15); j = EXTR(128, 15);
for (i = 0; i != 5; i++) { for (i = 0; i != 5; i++) {
*d++ = s[j]; *d++ = s[j];

47
src/table/palettes.h
View File

@ -151,33 +151,46 @@ static const Colour _palettes[][256] = {
#define GET_PALETTE(x) _palettes[x] #define GET_PALETTE(x) _palettes[x]
struct ExtraPaletteValues { struct ExtraPaletteValues {
Colour a[15]; // dark blue water Colour dark_water[15]; ///< dark blue water
Colour ac[15]; // dark blue water Toyland Colour dark_water_TOY[15]; ///< dark blue water Toyland
Colour lighthouse[12]; // lighthouse & stadium Colour lighthouse[12]; ///< lighthouse & stadium
Colour oil_ref[21]; // oil refinery Colour oil_ref[21]; ///< oil refinery
Colour e[15]; // ??? Colour fizzy_drink[15]; ///< fizzy drinks
Colour b[45]; // glittery water Colour glitter_water[45]; ///< glittery water
Colour bc[45]; // glittery water Toyland Colour glitter_water_TOY[45]; ///< glittery water Toyland
}; };
static const ExtraPaletteValues _extra_palette_values = { static const ExtraPaletteValues _extra_palette_values = {
/* dark blue water */
{ M( 32, 68, 112), M( 36, 72, 116), M( 40, 76, 120), M( 44, 80, 124), { M( 32, 68, 112), M( 36, 72, 116), M( 40, 76, 120), M( 44, 80, 124),
M( 48, 84, 128) }, M( 48, 84, 128) },
/* dark blue water Toyland */
{ M( 28, 108, 124), M( 32, 112, 128), M( 36, 116, 132), M( 40, 120, 136), { M( 28, 108, 124), M( 32, 112, 128), M( 36, 116, 132), M( 40, 120, 136),
M( 44, 124, 140) }, M( 44, 124, 140) },
/* lighthouse & stadium */
{ M(240, 208, 0), M( 0, 0, 0), M( 0, 0, 0), M( 0, 0, 0) }, { M(240, 208, 0), M( 0, 0, 0), M( 0, 0, 0), M( 0, 0, 0) },
/* oil refinery */
{ M(252, 60, 0), M(252, 84, 0), M(252, 108, 0), M(252, 124, 0), { M(252, 60, 0), M(252, 84, 0), M(252, 108, 0), M(252, 124, 0),
M(252, 148, 0), M(252, 172, 0), M(252, 196, 0) }, M(252, 148, 0), M(252, 172, 0), M(252, 196, 0) },
/* fizzy drinks */
{ M( 76, 24, 8), M(108, 44, 24), M(144, 72, 52), M(176, 108, 84), { M( 76, 24, 8), M(108, 44, 24), M(144, 72, 52), M(176, 108, 84),
M(212, 148, 128) }, M(212, 148, 128) },
/* glittery water */
{ M(216, 244, 252), M(172, 208, 224), M(132, 172, 196), M(100, 132, 168), { M(216, 244, 252), M(172, 208, 224), M(132, 172, 196), M(100, 132, 168),
M( 72, 100, 144), M( 72, 100, 144), M( 72, 100, 144), M( 72, 100, 144), M( 72, 100, 144), M( 72, 100, 144), M( 72, 100, 144), M( 72, 100, 144),
M( 72, 100, 144), M( 72, 100, 144), M( 72, 100, 144), M( 72, 100, 144), M( 72, 100, 144), M( 72, 100, 144), M( 72, 100, 144), M( 72, 100, 144),
M(100, 132, 168), M(132, 172, 196), M(172, 208, 224) }, M(100, 132, 168), M(132, 172, 196), M(172, 208, 224) },
/* glittery water Toyland */
{ M(216, 244, 252), M(180, 220, 232), M(148, 200, 216), M(116, 180, 196), { M(216, 244, 252), M(180, 220, 232), M(148, 200, 216), M(116, 180, 196),
M( 92, 164, 184), M( 92, 164, 184), M( 92, 164, 184), M( 92, 164, 184), M( 92, 164, 184), M( 92, 164, 184), M( 92, 164, 184), M( 92, 164, 184),
M( 92, 164, 184), M( 92, 164, 184), M( 92, 164, 184), M( 92, 164, 184), M( 92, 164, 184), M( 92, 164, 184), M( 92, 164, 184), M( 92, 164, 184),
M(116, 180, 196), M(148, 200, 216), M(180, 220, 232) } M(116, 180, 196), M(148, 200, 216), M(180, 220, 232) }
}; };
#undef M #undef M