dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r10408) -Codechange: make GetImage a class method of Vehicle instead of Get(Aircraft|RoadVeh|Ship|Train)Image.

Browse Source
This commit is contained in:
rubidium
2007-07-01 19:11:47 +00:00
parent c49fd0957d
commit 83a880c882
16 changed files with 61 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/aircraft_cmd.cpp
View File

@@ -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);
}