cpp/openttd-patchpack/source Changeset - r15636:256e5bcfbe12

Changeset - r15636:256e5bcfbe12

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

yexo - 14 years ago 2010-08-02 18:24:09
yexo@openttd.org

(svn r20311) -Codechange: don't reserve extra space in the savegame that is never used

5 files changed with 12 insertions and 23 deletions:

src/saveload/company_sl.cpp

src/saveload/economy_sl.cpp

src/saveload/engine_sl.cpp

src/saveload/industry_sl.cpp

src/saveload/vehicle_sl.cpp

0 comments (0 inline, 0 general)

src/saveload/company_sl.cpp

➞

Show inline comments

@@ @@ -157,14 +157,13 @@ static const SaveLoad _company_settings_ @@
 	SLE_CONDVAR(Company, settings.vehicle.servint_ispercent,   SLE_BOOL,     120, SL_MAX_VERSION),
 	SLE_CONDVAR(Company, settings.vehicle.servint_trains,    SLE_UINT16,     120, SL_MAX_VERSION),
 	SLE_CONDVAR(Company, settings.vehicle.servint_roadveh,   SLE_UINT16,     120, SL_MAX_VERSION),
 	SLE_CONDVAR(Company, settings.vehicle.servint_aircraft,  SLE_UINT16,     120, SL_MAX_VERSION),
 	SLE_CONDVAR(Company, settings.vehicle.servint_ships,     SLE_UINT16,     120, SL_MAX_VERSION),
 	/* Reserve extra space in savegame here. (currently 63 bytes) */
 	SLE_CONDNULL(63, 2, SL_MAX_VERSION),
 	SLE_CONDNULL(63, 2, 143), // old reserved space
 	SLE_END()
 };
 static const SaveLoad _company_settings_skip_desc[] = {
 	/* Engine renewal settings */
@@ @@ -180,14 +179,13 @@ static const SaveLoad _company_settings_ @@
 	SLE_CONDNULL(1, 120, SL_MAX_VERSION),    // settings.vehicle.servint_ispercent
 	SLE_CONDNULL(2, 120, SL_MAX_VERSION),    // settings.vehicle.servint_trains
 	SLE_CONDNULL(2, 120, SL_MAX_VERSION),    // settings.vehicle.servint_roadveh
 	SLE_CONDNULL(2, 120, SL_MAX_VERSION),    // settings.vehicle.servint_aircraft
 	SLE_CONDNULL(2, 120, SL_MAX_VERSION),    // settings.vehicle.servint_ships
 	/* Reserve extra space in savegame here. (currently 63 bytes) */
 	SLE_CONDNULL(63, 2, SL_MAX_VERSION),
 	SLE_CONDNULL(63, 2, 143), // old reserved space
 	SLE_END()
 };
 static const SaveLoad _company_economy_desc[] = {
 	/* these were changed to 64-bit in savegame format 2 */

src/saveload/economy_sl.cpp

➞

Show inline comments

@@ @@ -32,13 +32,13 @@ static void Load_CAPR() @@
 	SlArray(NULL, num_cargo, vt | SLE_VAR_NULL);
 	SlArray(NULL, num_cargo, SLE_FILE_U16 | SLE_VAR_NULL);
+}
 static const SaveLoad _economy_desc[] = {
 	SLE_CONDNULL(4,                                                                  0, 64),             // max_loan
-	SLE_CONDNULL(8,                                                                 65, SL_MAX_VERSION), // max_loan
+	SLE_CONDNULL(8,                                                                 65, 143), // max_loan
 	SLE_CONDVAR(Economy, old_max_loan_unround,          SLE_FILE_I32 | SLE_VAR_I64,  0, 64),
 	SLE_CONDVAR(Economy, old_max_loan_unround,          SLE_INT64,                  65, 125),
 	SLE_CONDVAR(Economy, old_max_loan_unround_fract,    SLE_UINT16,                 70, 125),
 	SLE_CONDVAR(Economy, inflation_prices,              SLE_UINT64,                126, SL_MAX_VERSION),
 	SLE_CONDVAR(Economy, inflation_payment,             SLE_UINT64,                126, SL_MAX_VERSION),
 	    SLE_VAR(Economy, fluct,                         SLE_INT16),

src/saveload/engine_sl.cpp

➞

Show inline comments

@@ @@ -34,14 +34,13 @@ static const SaveLoad _engine_desc[] = { @@
 	     SLE_VAR(Engine, preview_wait,        SLE_UINT8),
 	SLE_CONDNULL(1,                                                        0,  44),
 	 SLE_CONDVAR(Engine, company_avail,       SLE_FILE_U8  | SLE_VAR_U16,  0, 103),
 	 SLE_CONDVAR(Engine, company_avail,       SLE_UINT16,                104, SL_MAX_VERSION),
 	 SLE_CONDSTR(Engine, name,                SLE_STR, 0,                 84, SL_MAX_VERSION),
 	/* reserve extra space in savegame here. (currently 16 bytes) */
 	SLE_CONDNULL(16,                                                       2, SL_MAX_VERSION),
 	SLE_CONDNULL(16,                                                       2, 143), // old reserved space
 	SLE_END()
 };
 static std::map<EngineID, Engine> _temp_engine;

src/saveload/industry_sl.cpp

➞

Show inline comments

@@ @@ -52,14 +52,13 @@ static const SaveLoad _industry_desc[] = @@
 	SLE_CONDARR(Industry, psa.storage,                SLE_UINT32, 16,            76, SL_MAX_VERSION),
 	SLE_CONDVAR(Industry, random_triggers,            SLE_UINT8,                 82, SL_MAX_VERSION),
 	SLE_CONDVAR(Industry, random,                     SLE_UINT16,                82, SL_MAX_VERSION),
 	/* reserve extra space in savegame here. (currently 32 bytes) */
 	SLE_CONDNULL(32, 2, SL_MAX_VERSION),
 	SLE_CONDNULL(32, 2, 143), // old reserved space
 	SLE_END()
 };
 static void Save_INDY()
+{

src/saveload/vehicle_sl.cpp

➞

Show inline comments

@@ @@ -523,14 +523,13 @@ const SaveLoad *GetVehicleDescription(Ve @@
 		 SLE_CONDVAR(Vehicle, group_id,              SLE_UINT16,                  60, SL_MAX_VERSION),
 		 SLE_CONDVAR(Vehicle, current_order_time,    SLE_UINT32,                  67, SL_MAX_VERSION),
 		 SLE_CONDVAR(Vehicle, lateness_counter,      SLE_INT32,                   67, SL_MAX_VERSION),
 		/* reserve extra space in savegame here. (currently 10 bytes) */
 		SLE_CONDNULL(10,                                                           2, SL_MAX_VERSION),
 		SLE_CONDNULL(10,                                                           2, 143), // old reserved space
 		     SLE_END()
 	};
 	static const SaveLoad _train_desc[] = {
@@ @@ -546,14 +545,13 @@ const SaveLoad *GetVehicleDescription(Ve @@
 		SLE_CONDNULL(2, 2, 59),
 		 SLE_CONDVAR(Train, wait_counter,        SLE_UINT16,                 136, SL_MAX_VERSION),
 		SLE_CONDNULL(2, 2, 19),
 		 SLE_CONDVAR(Train, gv_flags,            SLE_UINT16,                 139, SL_MAX_VERSION),
 		/* reserve extra space in savegame here. (currently 11 bytes) */
 		SLE_CONDNULL(11, 2, SL_MAX_VERSION),
 		SLE_CONDNULL(11, 2, 143), // old reserved space
 		     SLE_END()
 	};
 	static const SaveLoad _roadveh_desc[] = {
 		SLE_WRITEBYTE(Vehicle, type, VEH_ROAD),
@@ @@ -567,25 +565,23 @@ const SaveLoad *GetVehicleDescription(Ve @@
 		     SLE_VAR(RoadVehicle, reverse_ctr,          SLE_UINT8),
 		SLE_CONDNULL(2,                                                               6,  68),
 		 SLE_CONDVAR(RoadVehicle, gv_flags,             SLE_UINT16,                 139, SL_MAX_VERSION),
 		SLE_CONDNULL(4,                                                              69, 130),
 		SLE_CONDNULL(2,                                                               6, 130),
 		/* reserve extra space in savegame here. (currently 16 bytes) */
 		SLE_CONDNULL(16,                                                              2, SL_MAX_VERSION),
 		SLE_CONDNULL(16,                                                              2, 143), // old reserved space
 		     SLE_END()
 	};
 	static const SaveLoad _ship_desc[] = {
 		SLE_WRITEBYTE(Vehicle, type, VEH_SHIP),
 		SLE_VEH_INCLUDE(),
 		     SLE_VAR(Ship, state, SLE_UINT8),
 		/* reserve extra space in savegame here. (currently 16 bytes) */
 		SLE_CONDNULL(16, 2, SL_MAX_VERSION),
 		SLE_CONDNULL(16, 2, 143), // old reserved space
 		     SLE_END()
 	};
 	static const SaveLoad _aircraft_desc[] = {
 		SLE_WRITEBYTE(Vehicle, type, VEH_AIRCRAFT),
@@ @@ -601,14 +597,13 @@ const SaveLoad *GetVehicleDescription(Ve @@
 		 SLE_CONDVAR(Aircraft, previous_pos,          SLE_UINT8,                    2, SL_MAX_VERSION),
 		 SLE_CONDVAR(Aircraft, last_direction,        SLE_UINT8,                    2, SL_MAX_VERSION),
 		 SLE_CONDVAR(Aircraft, number_consecutive_turns, SLE_UINT8,                 2, SL_MAX_VERSION),
 		 SLE_CONDVAR(Aircraft, turn_counter,          SLE_UINT8,                  136, SL_MAX_VERSION),
 		/* reserve extra space in savegame here. (currently 13 bytes) */
 		SLE_CONDNULL(13,                                                           2, SL_MAX_VERSION),
 		SLE_CONDNULL(13,                                                           2, 143), // old reserved space
 		     SLE_END()
 	};
 	static const SaveLoad _special_desc[] = {
 		SLE_WRITEBYTE(Vehicle, type, VEH_EFFECT),
@@ @@ -631,14 +626,13 @@ const SaveLoad *GetVehicleDescription(Ve @@
 		     SLE_VAR(EffectVehicle, animation_state,    SLE_UINT16),
 		     SLE_VAR(EffectVehicle, animation_substate, SLE_UINT8),
 		 SLE_CONDVAR(Vehicle, spritenum,             SLE_UINT8,                    2, SL_MAX_VERSION),
 		/* reserve extra space in savegame here. (currently 15 bytes) */
 		SLE_CONDNULL(15,                                                           2, SL_MAX_VERSION),
 		SLE_CONDNULL(15,                                                           2, 143), // old reserved space
 		     SLE_END()
 	};
 	static const SaveLoad _disaster_desc[] = {
 		SLE_WRITEBYTE(Vehicle, type, VEH_DISASTER),
@@ @@ -669,14 +663,13 @@ const SaveLoad *GetVehicleDescription(Ve @@
 		 SLE_CONDVAR(Vehicle, age,                   SLE_INT32,                   31, SL_MAX_VERSION),
 		     SLE_VAR(Vehicle, tick_counter,          SLE_UINT8),
 		     SLE_VAR(DisasterVehicle, image_override,            SLE_UINT16),
 		     SLE_VAR(DisasterVehicle, big_ufo_destroyer_target,  SLE_UINT16),
 		/* reserve extra space in savegame here. (currently 16 bytes) */
 		SLE_CONDNULL(16,                                                           2, SL_MAX_VERSION),
 		SLE_CONDNULL(16,                                                           2, 143), // old reserved space
 		     SLE_END()
 	};
 	static const SaveLoad * const _veh_descs[] = {

0 comments (0 inline, 0 general)