mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r21938) -Codechange: AfterLoadGame() is no longer friend of Vehicle.

release/1.1
alberth 2011-02-01 21:18:27 +00:00
parent 1a971fb6d6
commit 0ebc548a89
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/vehicle_base.h
View File

@ -115,7 +115,6 @@ struct GroundVehicleCache;
extern const SaveLoad *GetVehicleDescription(VehicleType vt); extern const SaveLoad *GetVehicleDescription(VehicleType vt);
struct LoadgameState; struct LoadgameState;
extern bool LoadOldVehicle(LoadgameState *ls, int num); extern bool LoadOldVehicle(LoadgameState *ls, int num);
extern bool AfterLoadGame();
extern void FixOldVehicles(); extern void FixOldVehicles();
/** %Vehicle data structure. */ /** %Vehicle data structure. */
@ -129,7 +128,6 @@ private:
Vehicle *previous_shared; ///< NOSAVE: pointer to the previous vehicle in the shared order chain Vehicle *previous_shared; ///< NOSAVE: pointer to the previous vehicle in the shared order chain
public: public:
friend const SaveLoad *GetVehicleDescription(VehicleType vt); ///< So we can use private/protected variables in the saveload code 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 FixOldVehicles();
friend void AfterLoadVehicles(bool part_of_load); ///< So we can set the previous and first pointers while loading 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 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) 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 GroupID group_id; ///< Index of group Pool array
byte subtype; ///< subtype (Filled with values from #EffectVehicles/#TrainSubTypes/#AircraftSubTypes) byte subtype; ///< subtype (Filled with values from #EffectVehicles/#TrainSubTypes/#AircraftSubTypes)