diff options
| author | rubidium <rubidium@openttd.org> | 2009-10-18 17:52:44 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-10-18 17:52:44 +0000 |
| commit | f11cebfe9b09bf5cf815d37ca6a19212755251ab (patch) | |
| tree | 664ac4f2e4f2d026dd8612509cdc545e1a0f9e1b /src/saveload/station_sl.cpp | |
| parent | 4ad30fecdee33708bc95a8e790b4c85814c36317 (diff) | |
| download | openttd-f11cebfe9b09bf5cf815d37ca6a19212755251ab.tar.xz | |
(svn r17807) -Codechange: move all 'updates' just after the 'load' constructor of CargoPackets to the constructor call itself
Diffstat (limited to 'src/saveload/station_sl.cpp')
| -rw-r--r-- | src/saveload/station_sl.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/saveload/station_sl.cpp b/src/saveload/station_sl.cpp index cce636046..b1cb2bed5 100644 --- a/src/saveload/station_sl.cpp +++ b/src/saveload/station_sl.cpp @@ -243,13 +243,12 @@ static void Load_STNS() if (CheckSavegameVersion(68)) { SB(ge->acceptance_pickup, GoodsEntry::ACCEPTANCE, 1, HasBit(_waiting_acceptance, 15)); if (GB(_waiting_acceptance, 0, 12) != 0) { - /* Don't construct the packet with station here, because that'll fail with old savegames */ - CargoPacket *cp = new CargoPacket(GB(_waiting_acceptance, 0, 12), _cargo_days, _cargo_feeder_share); /* In old versions, enroute_from used 0xFF as INVALID_STATION */ - cp->source = (CheckSavegameVersion(7) && _cargo_source == 0xFF) ? INVALID_STATION : _cargo_source; - cp->source_xy = _cargo_source_xy; + StationID source = (CheckSavegameVersion(7) && _cargo_source == 0xFF) ? INVALID_STATION : _cargo_source; + + /* Don't construct the packet with station here, because that'll fail with old savegames */ + ge->cargo.Append(new CargoPacket(GB(_waiting_acceptance, 0, 12), _cargo_days, source, _cargo_source_xy, _cargo_source_xy, _cargo_feeder_share)); SB(ge->acceptance_pickup, GoodsEntry::PICKUP, 1, 1); - ge->cargo.Append(cp); } } } |