(svn r11275) -Fix: oldloader crashing when referencing a vehicle that is not yet loaded.
authorrubidium
Tue, 16 Oct 2007 19:27:24 +0000
changeset 7738 1c288fd7f2bc
parent 7737 9d3de4ed7e60
child 7739 0b6f3da5c083
(svn r11275) -Fix: oldloader crashing when referencing a vehicle that is not yet loaded.
src/oldloader.cpp
--- a/src/oldloader.cpp	Tue Oct 16 00:35:59 2007 +0000
+++ b/src/oldloader.cpp	Tue Oct 16 19:27:24 2007 +0000
@@ -1231,7 +1231,7 @@
 			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);