diff options
| author | celestar <celestar@openttd.org> | 2005-07-24 15:56:31 +0000 |
|---|---|---|
| committer | celestar <celestar@openttd.org> | 2005-07-24 15:56:31 +0000 |
| commit | a3739aecdf2d9c4090181064db39db463e79439a (patch) | |
| tree | e02fce527cef08bc25354c995fecc8ddb0ab5318 /station_cmd.c | |
| parent | 647cbd6bdd113f7202a07fe19ad73a6710a85414 (diff) | |
| download | openttd-a3739aecdf2d9c4090181064db39db463e79439a.tar.xz | |
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
by enums. There remains work in gfx.c to move the "transparency" and
"recolor" bits around to make space for more sprites. However, 2800
additional sprites can now be loaded. There also remains cleanup and
Doxygen work on many of the header files.
Diffstat (limited to 'station_cmd.c')
| -rw-r--r-- | station_cmd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/station_cmd.c b/station_cmd.c index 7c2e2caca..551b490ff 100644 --- a/station_cmd.c +++ b/station_cmd.c @@ -2139,7 +2139,7 @@ static void DrawTile_Station(TileInfo *ti) { uint owner = GetTileOwner(ti->tile); - image_or_modificator = 0x315 << 16; /* NOTE: possible bug in ttd here? */ + image_or_modificator = PALETTE_TO_GREY; /* NOTE: possible bug in ttd here? */ if (owner < MAX_PLAYERS) image_or_modificator = PLAYER_SPRITE_COLOR(owner); } @@ -2166,11 +2166,11 @@ static void DrawTile_Station(TileInfo *ti) if (t == NULL) t = &_station_display_datas[ti->map5]; image = t->ground_sprite; - if (image & 0x8000) + if (image & PALETTE_MODIFIER_COLOR) image |= image_or_modificator; // For custom sprites, there's no railtype-based pitching. - type_offset = railtype * ((image & 0x3FFF) < _custom_sprites_base ? TRACKTYPE_SPRITE_PITCH : 1); + type_offset = railtype * ((image & SPRITE_MASK) < _custom_sprites_base ? TRACKTYPE_SPRITE_PITCH : 1); // station_land array has been increased from 82 elements to 114 // but this is something else. If AI builds station with 114 it looks all weird @@ -2193,7 +2193,7 @@ static void DrawTile_Station(TileInfo *ti) if (_display_opt & DO_TRANS_BUILDINGS) { MAKE_TRANSPARENT(image); } else { - if (image&0x8000) image |= image_or_modificator; + if (image & PALETTE_MODIFIER_COLOR) image |= image_or_modificator; } if ((byte)dtss->delta_z != 0x80) { @@ -2218,7 +2218,7 @@ void StationPickerDrawSprite(int x, int y, int railtype, int image) t = &_station_display_datas[image]; img = t->ground_sprite; - if (img & 0x8000) + if (img & PALETTE_MODIFIER_COLOR) img |= ormod; DrawSprite(img + railtype, x, y); |