cpp/openttd-patchpack/source Changeset - r17055:2989afdad450

Changeset - r17055:2989afdad450

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

smatz - 13 years ago 2011-01-15 14:20:34
smatz@openttd.org

(svn r21802) -Cleanup (r2600): remove unused _vehicle_id_ctr_day

4 files changed with 3 insertions and 5 deletions:

src/saveload/misc_sl.cpp

src/saveload/oldloader_sl.cpp

src/vehicle.cpp

src/vehicle_func.h

0 comments (0 inline, 0 general)

src/saveload/misc_sl.cpp

➞

Show inline comments

@@ @@ -64,13 +64,13 @@ void ResetViewportAfterLoadGame() @@
 static const SaveLoadGlobVarList _date_desc[] = {
 	SLEG_CONDVAR(_date,                   SLE_FILE_U16 | SLE_VAR_I32,  0,  30),
 	SLEG_CONDVAR(_date,                   SLE_INT32,                  31, SL_MAX_VERSION),
 	    SLEG_VAR(_date_fract,             SLE_UINT16),
 	    SLEG_VAR(_tick_counter,           SLE_UINT16),
-	    SLEG_VAR(_vehicle_id_ctr_day,     SLE_UINT16),
+	SLE_CONDNULL(2, 0, 156), // _vehicle_id_ctr_day
 	    SLEG_VAR(_age_cargo_skip_counter, SLE_UINT8),
 	SLE_CONDNULL(1, 0, 45),
 	SLEG_CONDVAR(_cur_tileloop_tile,      SLE_FILE_U16 | SLE_VAR_U32,  0, 5),
 	SLEG_CONDVAR(_cur_tileloop_tile,      SLE_UINT32,                  6, SL_MAX_VERSION),
 	    SLEG_VAR(_disaster_delay,         SLE_UINT16),
 	SLE_CONDNULL(2, 0, 119),
@@ @@ -89,13 +89,13 @@ static const SaveLoadGlobVarList _date_d @@
 static const SaveLoadGlobVarList _date_check_desc[] = {
 	SLEG_CONDVAR(_load_check_data.current_date,  SLE_FILE_U16 | SLE_VAR_I32,  0,  30),
 	SLEG_CONDVAR(_load_check_data.current_date,  SLE_INT32,                  31, SL_MAX_VERSION),
 	    SLE_NULL(2),                       // _date_fract
 	    SLE_NULL(2),                       // _tick_counter
-	    SLE_NULL(2),                       // _vehicle_id_ctr_day
+	SLE_CONDNULL(2, 0, 156),               // _vehicle_id_ctr_day
 	    SLE_NULL(1),                       // _age_cargo_skip_counter
 	SLE_CONDNULL(1, 0, 45),
 	SLE_CONDNULL(2, 0, 5),                 // _cur_tileloop_tile
 	SLE_CONDNULL(4, 6, SL_MAX_VERSION),    // _cur_tileloop_tile
 	    SLE_NULL(2),                       // _disaster_delay
 	SLE_CONDNULL(2, 0, 119),

src/saveload/oldloader_sl.cpp

➞

Show inline comments

@@ @@ -1653,13 +1653,13 @@ static const OldChunks main_chunk[] = { @@
 	OCL_CCHUNK( OC_TTD, 256, LoadOldEngine ),
 	OCL_CCHUNK( OC_TTO, 103, LoadOldEngine ),
 	OCL_ASSERT( OC_TTO, 0x496AC ),
-	OCL_VAR ( OC_UINT16,    1, &_vehicle_id_ctr_day ),
+	OCL_NULL ( 2 ), // _vehicle_id_ctr_day
 	OCL_CHUNK(  8, LoadOldSubsidy ),
 	OCL_ASSERT( OC_TTO, 0x496CE ),
 	OCL_VAR ( OC_FILE_U16 | OC_VAR_U32,   1, &_next_competitor_start ),

src/vehicle.cpp

➞

Show inline comments

@@ @@ -55,13 +55,12 @@ @@
 #include "ground_vehicle.hpp"
 #include "table/strings.h"
 #define GEN_HASH(x, y) ((GB((y), 6, 6) << 6) + GB((x), 7, 6))
 VehicleID _vehicle_id_ctr_day;
 VehicleID _new_vehicle_id;
 uint16 _returned_refit_capacity;      ///< Stores the capacity after a refit operation.
 uint16 _returned_mail_refit_capacity; ///< Stores the mail capacity after a refit operation (Aircraft only).
 byte _age_cargo_skip_counter;         ///< Skip aging of cargo?

src/vehicle_func.h

➞

Show inline comments

@@ @@ -169,13 +169,12 @@ static inline uint32 GetCmdSendToDepot(c @@
+}
 CommandCost EnsureNoVehicleOnGround(TileIndex tile);
 CommandCost EnsureNoTrainOnTrackBits(TileIndex tile, TrackBits track_bits);
 void StopAllVehicles();
 extern VehicleID _vehicle_id_ctr_day;
 extern VehicleID _new_vehicle_id;
 extern uint16 _returned_refit_capacity;
 extern uint16 _returned_mail_refit_capacity;
 extern byte _age_cargo_skip_counter;
 bool CanVehicleUseStation(EngineID engine_type, const struct Station *st);

0 comments (0 inline, 0 general)