Mercurial > hg > openttd
changeset 12020:e9a4f34044d8 draft
(svn r16427) -Codechange: replace a few magic numbers with an existing constant and unduplicate a few lines.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Tue, 26 May 2009 08:53:16 +0000 |
| parents | 985b63dd75b4 |
| children | 9ca215bac61b |
| files | src/aircraft_cmd.cpp src/roadveh_cmd.cpp src/ship_cmd.cpp src/train_cmd.cpp |
| diffstat | 4 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -187,7 +187,7 @@ spritenum = Engine::Get(engine)->image_index; } - return 6 + _aircraft_sprite[spritenum]; + return DIR_W + _aircraft_sprite[spritenum]; } void DrawAircraftEngine(int x, int y, EngineID engine, SpriteID pal)
--- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -93,7 +93,7 @@ spritenum = Engine::Get(engine)->image_index; } - return 6 + _roadveh_images[spritenum]; + return DIR_W + _roadveh_images[spritenum]; } SpriteID RoadVehicle::GetImage(Direction direction) const
--- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -59,7 +59,7 @@ spritenum = Engine::Get(engine)->image_index; } - return 6 + _ship_sprites[spritenum]; + return DIR_W + _ship_sprites[spritenum]; } void DrawShipEngine(int x, int y, EngineID engine, SpriteID pal)
--- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -568,6 +568,11 @@ v->acceleration = Clamp(power / weight * 4, 1, 255); } +static SpriteID GetDefaultTrainSprite(uint8 spritenum, Direction direction) +{ + return ((direction + _engine_sprite_add[spritenum]) & _engine_sprite_and[spritenum]) + _engine_sprite_base[spritenum]; +} + SpriteID Train::GetImage(Direction direction) const { uint8 spritenum = this->spritenum; @@ -582,7 +587,7 @@ spritenum = Engine::Get(this->engine_type)->image_index; } - sprite = _engine_sprite_base[spritenum] + ((direction + _engine_sprite_add[spritenum]) & _engine_sprite_and[spritenum]); + sprite = GetDefaultTrainSprite(spritenum, direction); if (this->cargo.Count() >= this->cargo_cap / 2U) sprite += _wagon_full_adder[spritenum]; @@ -606,7 +611,7 @@ if (rear_head) spritenum++; - return ((6 + _engine_sprite_add[spritenum]) & _engine_sprite_and[spritenum]) + _engine_sprite_base[spritenum]; + return GetDefaultTrainSprite(spritenum, DIR_W); } void DrawTrainEngine(int x, int y, EngineID engine, SpriteID pal)