summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryexo <yexo@openttd.org>2010-08-02 18:24:09 +0000
committeryexo <yexo@openttd.org>2010-08-02 18:24:09 +0000
commitdff871b40d56e05e58636396b74ad4468e11f6a4 (patch)
treeff47ea9b5f4f7a017babe0e67c0e28fa81c574c4
parent9b9d8088b0a494901bb29c65966d214542f52cbb (diff)
downloadopenttd-dff871b40d56e05e58636396b74ad4468e11f6a4.tar.xz
(svn r20311) -Codechange: don't reserve extra space in the savegame that is never used
-rw-r--r--src/saveload/company_sl.cpp6
-rw-r--r--src/saveload/economy_sl.cpp2
-rw-r--r--src/saveload/engine_sl.cpp3
-rw-r--r--src/saveload/industry_sl.cpp3
-rw-r--r--src/saveload/vehicle_sl.cpp21
5 files changed, 12 insertions, 23 deletions
diff --git a/src/saveload/company_sl.cpp b/src/saveload/company_sl.cpp
index ada71cf72..917f29335 100644
--- a/src/saveload/company_sl.cpp
+++ b/src/saveload/company_sl.cpp
@@ -160,8 +160,7 @@ static const SaveLoad _company_settings_desc[] = {
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()
};
@@ -183,8 +182,7 @@ static const SaveLoad _company_settings_skip_desc[] = {
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()
};
diff --git a/src/saveload/economy_sl.cpp b/src/saveload/economy_sl.cpp
index c650a5cc2..cff98c5a5 100644
--- a/src/saveload/economy_sl.cpp
+++ b/src/saveload/economy_sl.cpp
@@ -35,7 +35,7 @@ static void Load_CAPR()
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),
diff --git a/src/saveload/engine_sl.cpp b/src/saveload/engine_sl.cpp
index 9737219df..038717e3f 100644
--- a/src/saveload/engine_sl.cpp
+++ b/src/saveload/engine_sl.cpp
@@ -37,8 +37,7 @@ static const SaveLoad _engine_desc[] = {
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()
};
diff --git a/src/saveload/industry_sl.cpp b/src/saveload/industry_sl.cpp
index ef2540029..c99bbc446 100644
--- a/src/saveload/industry_sl.cpp
+++ b/src/saveload/industry_sl.cpp
@@ -55,8 +55,7 @@ static const SaveLoad _industry_desc[] = {
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()
};
diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp
index d3d173da8..e7842725b 100644
--- a/src/saveload/vehicle_sl.cpp
+++ b/src/saveload/vehicle_sl.cpp
@@ -526,8 +526,7 @@ const SaveLoad *GetVehicleDescription(VehicleType vt)
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()
};
@@ -549,8 +548,7 @@ const SaveLoad *GetVehicleDescription(VehicleType vt)
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()
};
@@ -570,8 +568,7 @@ const SaveLoad *GetVehicleDescription(VehicleType vt)
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()
};
@@ -581,8 +578,7 @@ const SaveLoad *GetVehicleDescription(VehicleType vt)
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()
};
@@ -604,8 +600,7 @@ const SaveLoad *GetVehicleDescription(VehicleType vt)
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()
};
@@ -634,8 +629,7 @@ const SaveLoad *GetVehicleDescription(VehicleType vt)
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()
};
@@ -672,8 +666,7 @@ const SaveLoad *GetVehicleDescription(VehicleType vt)
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()
};