cpp/openttd-patchpack/source Changeset - r17292:d19d0b18c8d8

Changeset - r17292:d19d0b18c8d8

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

smatz - 14 years ago 2011-02-09 18:56:40
smatz@openttd.org

(svn r22042) -Fix: when loading a TTO/TTD savegame, verify we can allocate a CargoPacket before actually trying to do so

1 file changed with 2 insertions and 2 deletions:

src/saveload/oldloader_sl.cpp

0 comments (0 inline, 0 general)

src/saveload/oldloader_sl.cpp

➞

Show inline comments

@@ @@ -707,13 +707,13 @@ static bool LoadOldGood(LoadgameState *l @@
 	GoodsEntry *ge = &st->goods[num];
 	if (!LoadChunk(ls, ge, goods_chunk)) return false;
 	SB(ge->acceptance_pickup, GoodsEntry::ACCEPTANCE, 1, HasBit(_waiting_acceptance, 15));
 	SB(ge->acceptance_pickup, GoodsEntry::PICKUP, 1, _cargo_source != 0xFF);
 	if (GB(_waiting_acceptance, 0, 12) != 0) {
+	if (GB(_waiting_acceptance, 0, 12) != 0 && CargoPacket::CanAllocateItem()) {
 		ge->cargo.Append(new CargoPacket(GB(_waiting_acceptance, 0, 12), _cargo_days, (_cargo_source == 0xFF) ? INVALID_STATION : _cargo_source, 0, 0));
+	}
 	return true;
+}
@@ @@ -1344,13 +1344,13 @@ bool LoadOldVehicle(LoadgameState *ls, i @@
 			if (old_id < max) v->orders.old = Order::Get(old_id); // don't accept orders > max number of orders
+		}
 		v->current_order.AssignOrder(UnpackOldOrder(_old_order));
 		v->next = (Vehicle *)(size_t)_old_next_ptr;
 		if (_cargo_count != 0) {
+		if (_cargo_count != 0 && CargoPacket::CanAllocateItem()) {
 			StationID source =    (_cargo_source == 0xFF) ? INVALID_STATION : _cargo_source;
 			TileIndex source_xy = (source != INVALID_STATION) ? Station::Get(source)->xy : 0;
 			v->cargo.Append(new CargoPacket(_cargo_count, _cargo_days, source, source_xy, source_xy));
+		}
+	}

0 comments (0 inline, 0 general)