From c5dac6e6199c93bd2007072aa21122cc36a7e67c Mon Sep 17 00:00:00 2001 From: Rubidium Date: Tue, 21 Jan 2025 21:18:16 +0100 Subject: [PATCH] Codechange: use correct type for variable to prevent casts later on --- src/saveload/vehicle_sl.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index e52bf68fb4..504494391b 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -631,8 +631,8 @@ void FixupTrainLengths() } static uint8_t _cargo_periods; -static uint16_t _cargo_source; -static uint32_t _cargo_source_xy; +static StationID _cargo_source; +static TileIndex _cargo_source_xy; static uint16_t _cargo_count; static uint16_t _cargo_paid_for; static Money _cargo_feeder_share; @@ -1138,7 +1138,7 @@ struct VEHSChunkHandler : ChunkHandler { if (_cargo_count != 0 && IsCompanyBuildableVehicleType(v) && CargoPacket::CanAllocateItem()) { /* Don't construct the packet with station here, because that'll fail with old savegames */ - CargoPacket *cp = new CargoPacket(_cargo_count, _cargo_periods, _cargo_source, TileIndex{_cargo_source_xy}, _cargo_feeder_share); + CargoPacket *cp = new CargoPacket(_cargo_count, _cargo_periods, _cargo_source, _cargo_source_xy, _cargo_feeder_share); v->cargo.Append(cp); }