diff options
author | rubidium <rubidium@openttd.org> | 2009-05-22 18:57:11 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-05-22 18:57:11 +0000 |
commit | 74ea34ca669b5027003a6c760c59903b69ddbee8 (patch) | |
tree | d159e298d06e91885853ff9e818c5d9e7c92cecb /src/vehicle_base.h | |
parent | 6d1c974254735f5d4232907718f2cac1869c64c8 (diff) | |
download | openttd-74ea34ca669b5027003a6c760c59903b69ddbee8.tar.xz |
(svn r16385) -Codechange: move u.disaster to DisasterVehicle.
Diffstat (limited to 'src/vehicle_base.h')
-rw-r--r-- | src/vehicle_base.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/vehicle_base.h b/src/vehicle_base.h index 03c9dcb4e..9434cd596 100644 --- a/src/vehicle_base.h +++ b/src/vehicle_base.h @@ -175,11 +175,6 @@ struct VehicleRoad { RoadTypes compatible_roadtypes; }; -struct VehicleDisaster { - uint16 image_override; - VehicleID big_ufo_destroyer_target; -}; - typedef Pool<Vehicle, VehicleID, 512, 64000> VehiclePool; extern VehiclePool _vehicle_pool; @@ -311,7 +306,6 @@ public: VehicleRail rail; VehicleAir air; VehicleRoad road; - VehicleDisaster disaster; } u; /* cached oftenly queried NewGRF values */ @@ -621,6 +615,9 @@ public: * As side-effect the vehicle type is set correctly. */ struct DisasterVehicle : public Vehicle { + uint16 image_override; + VehicleID big_ufo_destroyer_target; + /** Initializes the Vehicle to a disaster vehicle */ DisasterVehicle() { this->type = VEH_DISASTER; } @@ -630,6 +627,7 @@ struct DisasterVehicle : public Vehicle { const char *GetTypeString() const { return "disaster vehicle"; } void UpdateDeltaXY(Direction direction); bool Tick(); + DisasterVehicle *Next() { return (DisasterVehicle*)this->Vehicle::Next(); } }; #define FOR_ALL_VEHICLES_FROM(var, start) FOR_ALL_ITEMS_FROM(Vehicle, vehicle_index, var, start) |