dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r20819) -Fix [FS#3714]: be a bit more "lenient" w.r.t. invalid savegames; don't crash on saveload related NOT_REACHEDs, just show the user an error that the savegame is corrupted

Browse Source
This commit is contained in:
rubidium
2010-09-16 22:06:36 +00:00
parent 5b733f88a8
commit 97dbb1f27d
6 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/saveload/oldloader_sl.cpp
View File

@@ -1095,7 +1095,7 @@ static bool LoadOldVehicleUnion(LoadgameState *ls, int num)
res = LoadChunk(ls, NULL, vehicle_empty_chunk);
} else {
switch (v->type) {
default: NOT_REACHED();
default: SlErrorCorrupt("Invalid vehicle type");
case VEH_TRAIN : res = LoadChunk(ls, v, vehicle_train_chunk); break;
case VEH_ROAD : res = LoadChunk(ls, v, vehicle_road_chunk); break;
case VEH_SHIP : res = LoadChunk(ls, v, vehicle_ship_chunk); break;
@@ -1295,7 +1295,7 @@ bool LoadOldVehicle(LoadgameState *ls, int num)
} else {
/* Read the vehicle type and allocate the right vehicle */
switch (ReadByte(ls)) {
default: NOT_REACHED();
default: SlErrorCorrupt("Invalid vehicle type");
case 0x00 /* VEH_INVALID */: v = NULL; break;
case 0x10 /* VEH_TRAIN */: v = new (_current_vehicle_id) Train(); break;
case 0x11 /* VEH_ROAD */: v = new (_current_vehicle_id) RoadVehicle(); break;