diff options
| author | smatz <smatz@openttd.org> | 2011-01-15 14:20:34 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2011-01-15 14:20:34 +0000 |
| commit | 2709454040185af96feb80a25f51c412fa6f1ad1 (patch) | |
| tree | 8429245963dcb576870f3bbf9ace7e8ddc52abe0 | |
| parent | 7be31ee03e59ad547ceef362284677d232a642aa (diff) | |
| download | openttd-2709454040185af96feb80a25f51c412fa6f1ad1.tar.xz | |
(svn r21802) -Cleanup (r2600): remove unused _vehicle_id_ctr_day
| -rw-r--r-- | src/saveload/misc_sl.cpp | 4 | ||||
| -rw-r--r-- | src/saveload/oldloader_sl.cpp | 2 | ||||
| -rw-r--r-- | src/vehicle.cpp | 1 | ||||
| -rw-r--r-- | src/vehicle_func.h | 1 |
4 files changed, 3 insertions, 5 deletions
diff --git a/src/saveload/misc_sl.cpp b/src/saveload/misc_sl.cpp index 4415d67d6..0f389246e 100644 --- a/src/saveload/misc_sl.cpp +++ b/src/saveload/misc_sl.cpp @@ -67,7 +67,7 @@ static const SaveLoadGlobVarList _date_desc[] = { 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), @@ -92,7 +92,7 @@ static const SaveLoadGlobVarList _date_check_desc[] = { 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 diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp index cdb1fff6f..a42e6e14a 100644 --- a/src/saveload/oldloader_sl.cpp +++ b/src/saveload/oldloader_sl.cpp @@ -1656,7 +1656,7 @@ static const OldChunks main_chunk[] = { 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 ), diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 8777ea1be..f5bffc159 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -58,7 +58,6 @@ #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). diff --git a/src/vehicle_func.h b/src/vehicle_func.h index 0015a4295..2f43d7d02 100644 --- a/src/vehicle_func.h +++ b/src/vehicle_func.h @@ -172,7 +172,6 @@ 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; |