summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralberth <alberth@openttd.org>2011-02-01 21:18:27 +0000
committeralberth <alberth@openttd.org>2011-02-01 21:18:27 +0000
commit0ebc548a89a9966bc6ccae2731bf4d187efbe0b5 (patch)
treeb211ef2c04c818ef9cdee5dbe9b32b71557c370e
parent1a971fb6d6afbde026b0483f1c3b143081059d6a (diff)
downloadopenttd-0ebc548a89a9966bc6ccae2731bf4d187efbe0b5.tar.xz
(svn r21938) -Codechange: AfterLoadGame() is no longer friend of Vehicle.
-rw-r--r--src/vehicle_base.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/vehicle_base.h b/src/vehicle_base.h
index a838edcbf..baf99d398 100644
--- a/src/vehicle_base.h
+++ b/src/vehicle_base.h
@@ -115,7 +115,6 @@ struct GroundVehicleCache;
extern const SaveLoad *GetVehicleDescription(VehicleType vt);
struct LoadgameState;
extern bool LoadOldVehicle(LoadgameState *ls, int num);
-extern bool AfterLoadGame();
extern void FixOldVehicles();
/** %Vehicle data structure. */
@@ -129,7 +128,6 @@ private:
Vehicle *previous_shared; ///< NOSAVE: pointer to the previous vehicle in the shared order chain
public:
friend const SaveLoad *GetVehicleDescription(VehicleType vt); ///< So we can use private/protected variables in the saveload code
- friend bool AfterLoadGame();
friend void FixOldVehicles();
friend void AfterLoadVehicles(bool part_of_load); ///< So we can set the previous and first pointers while loading
friend bool LoadOldVehicle(LoadgameState *ls, int num); ///< So we can set the proper next pointer while loading
@@ -232,7 +230,7 @@ public:
byte vehicle_flags; ///< Used for gradual loading and other miscellaneous things (@see VehicleFlags enum)
- uint16 load_unload_ticks; ///< Ticks to wait before starting next cycle.
+ uint16 load_unload_ticks; ///< Ticks to wait before starting next cycle.
GroupID group_id; ///< Index of group Pool array
byte subtype; ///< subtype (Filled with values from #EffectVehicles/#TrainSubTypes/#AircraftSubTypes)