summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--oldloader.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/oldloader.c b/oldloader.c
index c0d23b5a8..2461f214b 100644
--- a/oldloader.c
+++ b/oldloader.c
@@ -1269,6 +1269,12 @@ static bool LoadOldVehicle(LoadgameState *ls, int num)
if (!LoadChunk(ls, v, vehicle_chunk))
return false;
+ /* This should be consistent, else we have a big problem... */
+ if (v->index != _current_vehicle_id) {
+ DEBUG(oldloader, 0)("[OldLoader] -- Loading failed - vehicle-array is invalid");
+ return false;
+ }
+
if (_old_order_ptr != 0 && _old_order_ptr != 0xFFFFFFFF) {
v->orders = GetOrder(REMAP_ORDER_IDX(_old_order_ptr));
}
@@ -1614,6 +1620,8 @@ bool LoadOldSaveGame(const char *file)
fclose(_ls.file);
+ _pause = 2;
+
return true;
}