diff options
| author | frosch <frosch@openttd.org> | 2011-11-01 16:51:47 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2011-11-01 16:51:47 +0000 |
| commit | bbc3409942565cd6876016e270288517cb6acafb (patch) | |
| tree | 3079bbaa5682e25b2805774cd2382e9c0c6ef109 /src/roadveh_cmd.cpp | |
| parent | e802dc66b9d1e913e77816184ed2744f737823ec (diff) | |
| download | openttd-bbc3409942565cd6876016e270288517cb6acafb.tar.xz | |
(svn r23080) -Feature: [NewGRF] Use variable 10 to enable vehicle GRFs to draw different sprites on the map and in various GUIs.
Diffstat (limited to 'src/roadveh_cmd.cpp')
| -rw-r--r-- | src/roadveh_cmd.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index 15e29f3e5..ee6961b39 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -103,13 +103,13 @@ int RoadVehicle::GetDisplayImageWidth(Point *offset) const return this->gcache.cached_veh_length * reference_width / VEHICLE_LENGTH; } -static SpriteID GetRoadVehIcon(EngineID engine) +static SpriteID GetRoadVehIcon(EngineID engine, EngineImageType image_type) { const Engine *e = Engine::Get(engine); uint8 spritenum = e->u.road.image_index; if (is_custom_sprite(spritenum)) { - SpriteID sprite = GetCustomVehicleIcon(engine, DIR_W); + SpriteID sprite = GetCustomVehicleIcon(engine, DIR_W, image_type); if (sprite != 0) return sprite; spritenum = e->original_image_index; @@ -118,13 +118,13 @@ static SpriteID GetRoadVehIcon(EngineID engine) return DIR_W + _roadveh_images[spritenum]; } -SpriteID RoadVehicle::GetImage(Direction direction) const +SpriteID RoadVehicle::GetImage(Direction direction, EngineImageType image_type) const { uint8 spritenum = this->spritenum; SpriteID sprite; if (is_custom_sprite(spritenum)) { - sprite = GetCustomVehicleSprite(this, (Direction)(direction + 4 * IS_CUSTOM_SECONDHEAD_SPRITE(spritenum))); + sprite = GetCustomVehicleSprite(this, (Direction)(direction + 4 * IS_CUSTOM_SECONDHEAD_SPRITE(spritenum)), image_type); if (sprite != 0) return sprite; spritenum = this->GetEngine()->original_image_index; @@ -146,9 +146,9 @@ SpriteID RoadVehicle::GetImage(Direction direction) const * @param engine Engine to draw * @param pal Palette to use. */ -void DrawRoadVehEngine(int left, int right, int preferred_x, int y, EngineID engine, PaletteID pal) +void DrawRoadVehEngine(int left, int right, int preferred_x, int y, EngineID engine, PaletteID pal, EngineImageType image_type) { - SpriteID sprite = GetRoadVehIcon(engine); + SpriteID sprite = GetRoadVehIcon(engine, image_type); const Sprite *real_sprite = GetSprite(sprite, ST_NORMAL); preferred_x = Clamp(preferred_x, left - real_sprite->x_offs, right - real_sprite->width - real_sprite->x_offs); DrawSprite(sprite, pal, preferred_x, y); |