diff options
| author | frosch <frosch@openttd.org> | 2010-01-22 18:47:29 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2010-01-22 18:47:29 +0000 |
| commit | 6260d243eea9276b58f2afd9be64f3cee645b531 (patch) | |
| tree | 9abd816500d992b7b0be43b7cf8e8458176d03d3 | |
| parent | 7f094352395cf073bbb7d8330de29a5eeec34bbe (diff) | |
| download | openttd-6260d243eea9276b58f2afd9be64f3cee645b531.tar.xz | |
(svn r18888) -Codechange: Rename PALETTE_59[EF] to something more meaningful.
| -rw-r--r-- | src/table/sprites.h | 7 | ||||
| -rw-r--r-- | src/table/town_land.h | 24 |
2 files changed, 15 insertions, 16 deletions
diff --git a/src/table/sprites.h b/src/table/sprites.h index a47573598..0a12742e3 100644 --- a/src/table/sprites.h +++ b/src/table/sprites.h @@ -1507,9 +1507,8 @@ static const PaletteID PALETTE_TO_TRANSPARENT = 0x322; // This sets the spr static const PaletteID PALETTE_TO_STRUCT_GREY = 0x323; static const PaletteID PALETTE_CRASH = 0x324; -/* XXX another place where structures are coloured. - * I'm not sure which colours these are */ -static const PaletteID PALETTE_59E = 0x59E; -static const PaletteID PALETTE_59F = 0x59F; +/* Two recolourings only used by the church */ +static const PaletteID PALETTE_CHURCH_RED = 0x59E; +static const PaletteID PALETTE_CHURCH_CREAM = 0x59F; #endif /* SPRITES_H */ diff --git a/src/table/town_land.h b/src/table/town_land.h index 7f678da63..9090e1044 100644 --- a/src/table/town_land.h +++ b/src/table/town_land.h @@ -77,18 +77,18 @@ static const DrawBuildingsTileStruct _town_draw_tile_data[] = { M( 0xf54, PAL_NONE, 0x59b, PAL_NONE, 0, 0, 14, 16, 22, 0), M( 0xf54, PAL_NONE, 0x59c, PAL_NONE, 0, 0, 14, 16, 35, 0), M( 0x59d, PAL_NONE, 0x59c, PAL_NONE, 0, 0, 14, 16, 35, 0), - M( 0xf54, PAL_NONE, 0x59a, PALETTE_59E, 0, 0, 14, 16, 16, 0), - M( 0xf54, PAL_NONE, 0x59b, PALETTE_59E, 0, 0, 14, 16, 22, 0), - M( 0xf54, PAL_NONE, 0x59c, PALETTE_59E, 0, 0, 14, 16, 35, 0), - M( 0x59d, PAL_NONE, 0x59c, PALETTE_59E, 0, 0, 14, 16, 35, 0), - M( 0xf54, PAL_NONE, 0x59a, PALETTE_59F, 0, 0, 14, 16, 16, 0), - M( 0xf54, PAL_NONE, 0x59b, PALETTE_59F, 0, 0, 14, 16, 22, 0), - M( 0xf54, PAL_NONE, 0x59c, PALETTE_59F, 0, 0, 14, 16, 35, 0), - M( 0x59d, PAL_NONE, 0x59c, PALETTE_59F, 0, 0, 14, 16, 35, 0), - M( 0xf54, PAL_NONE, 0x59a, PALETTE_59F, 0, 0, 14, 16, 16, 0), - M( 0xf54, PAL_NONE, 0x59b, PALETTE_59F, 0, 0, 14, 16, 22, 0), - M( 0xf54, PAL_NONE, 0x59c, PALETTE_59F, 0, 0, 14, 16, 35, 0), - M( 0x59d, PAL_NONE, 0x59c, PALETTE_59F, 0, 0, 14, 16, 35, 0), + M( 0xf54, PAL_NONE, 0x59a, PALETTE_CHURCH_RED, 0, 0, 14, 16, 16, 0), + M( 0xf54, PAL_NONE, 0x59b, PALETTE_CHURCH_RED, 0, 0, 14, 16, 22, 0), + M( 0xf54, PAL_NONE, 0x59c, PALETTE_CHURCH_RED, 0, 0, 14, 16, 35, 0), + M( 0x59d, PAL_NONE, 0x59c, PALETTE_CHURCH_RED, 0, 0, 14, 16, 35, 0), + M( 0xf54, PAL_NONE, 0x59a, PALETTE_CHURCH_CREAM, 0, 0, 14, 16, 16, 0), + M( 0xf54, PAL_NONE, 0x59b, PALETTE_CHURCH_CREAM, 0, 0, 14, 16, 22, 0), + M( 0xf54, PAL_NONE, 0x59c, PALETTE_CHURCH_CREAM, 0, 0, 14, 16, 35, 0), + M( 0x59d, PAL_NONE, 0x59c, PALETTE_CHURCH_CREAM, 0, 0, 14, 16, 35, 0), + M( 0xf54, PAL_NONE, 0x59a, PALETTE_CHURCH_CREAM, 0, 0, 14, 16, 16, 0), + M( 0xf54, PAL_NONE, 0x59b, PALETTE_CHURCH_CREAM, 0, 0, 14, 16, 22, 0), + M( 0xf54, PAL_NONE, 0x59c, PALETTE_CHURCH_CREAM, 0, 0, 14, 16, 35, 0), + M( 0x59d, PAL_NONE, 0x59c, PALETTE_CHURCH_CREAM, 0, 0, 14, 16, 35, 0), M( 0xf54, PAL_NONE, 0x5a0, PAL_NONE, 0, 0, 15, 15, 5, 0), M( 0xf54, PAL_NONE, 0x5a1, PAL_NONE, 0, 0, 15, 15, 53, 0), M( 0xf54, PAL_NONE, 0x5a2, PAL_NONE, 0, 0, 15, 15, 53, 0), |