Changeset - r17189:23ff37017dfa
[Not reviewed]
master
0 1 0
alberth - 14 years ago 2011-02-01 21:18:27
alberth@openttd.org
(svn r21938) -Codechange: AfterLoadGame() is no longer friend of Vehicle.
1 file changed with 1 insertions and 3 deletions:
0 comments (0 inline, 0 general)
src/vehicle_base.h
Show inline comments
 
@@ -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)
 

	
0 comments (0 inline, 0 general)