diff options
author | rubidium <rubidium@openttd.org> | 2007-07-01 19:11:47 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-07-01 19:11:47 +0000 |
commit | 83a880c882992efb1b949b26ac881abc3825964f (patch) | |
tree | 2e6180dd4e262fcc66cf94a5d26c4c6fb7df642f /src/aircraft_cmd.cpp | |
parent | c49fd0957d9e0fbecd365b2c86e82a1a37625921 (diff) | |
download | openttd-83a880c882992efb1b949b26ac881abc3825964f.tar.xz |
(svn r10408) -Codechange: make GetImage a class method of Vehicle instead of Get(Aircraft|RoadVeh|Ship|Train)Image.
Diffstat (limited to 'src/aircraft_cmd.cpp')
-rw-r--r-- | src/aircraft_cmd.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index fa16ab26b..99a3b7e2d 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -153,15 +153,15 @@ static bool HaveHangarInOrderList(Vehicle *v) } #endif -int GetAircraftImage(const Vehicle* v, Direction direction) +int Aircraft::GetImage(Direction direction) const { - int spritenum = v->spritenum; + int spritenum = this->spritenum; if (is_custom_sprite(spritenum)) { - int sprite = GetCustomVehicleSprite(v, direction); + int sprite = GetCustomVehicleSprite(this, direction); if (sprite != 0) return sprite; - spritenum = orig_aircraft_vehicle_info[v->engine_type - AIRCRAFT_ENGINES_INDEX].image_index; + spritenum = orig_aircraft_vehicle_info[this->engine_type - AIRCRAFT_ENGINES_INDEX].image_index; } return direction + _aircraft_sprite[spritenum]; } @@ -827,7 +827,7 @@ static void SetAircraftPosition(Vehicle *v, int x, int y, int z) v->y_pos = y; v->z_pos = z; - v->cur_image = GetAircraftImage(v, v->direction); + v->cur_image = v->GetImage(v->direction); if (v->subtype == AIR_HELICOPTER) v->next->next->cur_image = GetRotorImage(v); BeginVehicleMove(v); @@ -1409,7 +1409,7 @@ static void ProcessAircraftOrder(Vehicle *v) void Aircraft::MarkDirty() { - this->cur_image = GetAircraftImage(this, this->direction); + this->cur_image = this->GetImage(this->direction); if (this->subtype == AIR_HELICOPTER) this->next->next->cur_image = GetRotorImage(this); MarkAllViewportsDirty(this->left_coord, this->top_coord, this->right_coord + 1, this->bottom_coord + 1); } |