From 4f512a70c360e2aa45e80aacdbcc95d2a754b987 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 16 Oct 2007 19:27:24 +0000 Subject: (svn r11275) -Fix: oldloader crashing when referencing a vehicle that is not yet loaded. --- src/oldloader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/oldloader.cpp b/src/oldloader.cpp index 0f39e2600..f3d394bd1 100644 --- a/src/oldloader.cpp +++ b/src/oldloader.cpp @@ -1231,7 +1231,7 @@ bool LoadOldVehicle(LoadgameState *ls, int num) default: v->spritenum >>= 1; break; } - if (_old_next_ptr != 0xFFFF) v->next = GetVehicle(_old_next_ptr); + if (_old_next_ptr != 0xFFFF) v->next = GetVehiclePoolSize() <= _old_next_ptr ? new (_old_next_ptr) InvalidVehicle() : GetVehicle(_old_next_ptr); v->string_id = RemapOldStringID(_old_string_id); -- cgit v1.2.3-54-g00ecf