Mercurial > hg > openttd
changeset 5866:dd06d88cbc97 draft
(svn r8448) -Codechange/Fix (r2993): Also update the helicopter's rotor when loading the game. This can solve crashes when a game is loaded with missing GRF's
author | Darkvater <Darkvater@openttd.org> |
---|---|
date | Sun, 28 Jan 2007 21:53:13 +0000 |
parents | a339ec477b6b |
children | 0f2d3b2a5f01 |
files | src/vehicle.cpp src/vehicle.h |
diffstat | 2 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -234,7 +234,16 @@ case VEH_Aircraft: if (IsNormalAircraft(v)) { v->cur_image = GetAircraftImage(v, v->direction); - if (v->next != NULL) v->next->cur_image = v->cur_image; + + /* The plane's shadow will have the same image as the plane */ + Vehicle *shadow = v->next; + shadow->cur_image = v->cur_image; + + /* In the case of a helicopter we will update the rotor sprites */ + if (v->subtype == AIR_HELICOPTER) { + Vehicle *rotor = shadow->next; + rotor->cur_image = GetRotorImage(v); + } } break; default: break;
--- a/src/vehicle.h +++ b/src/vehicle.h @@ -296,6 +296,7 @@ int GetAircraftImage(const Vehicle* v, Direction direction); int GetRoadVehImage(const Vehicle* v, Direction direction); int GetShipImage(const Vehicle* v, Direction direction); +SpriteID GetRotorImage(const Vehicle *v); Vehicle *CreateEffectVehicle(int x, int y, int z, EffectVehicle type); Vehicle *CreateEffectVehicleAbove(int x, int y, int z, EffectVehicle type);