diff options
| author | rubidium <rubidium@openttd.org> | 2010-09-16 22:06:36 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-09-16 22:06:36 +0000 |
| commit | 97dbb1f27d6e1cad6be0b53f74a88694562f1331 (patch) | |
| tree | ce1f613fc78678b0d5c54ff939b14563f1b55a1b /src/saveload/vehicle_sl.cpp | |
| parent | 5b733f88a8f05c84d3e0ce7a19c3c9c79054657f (diff) | |
| download | openttd-97dbb1f27d6e1cad6be0b53f74a88694562f1331.tar.xz | |
(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
Diffstat (limited to 'src/saveload/vehicle_sl.cpp')
| -rw-r--r-- | src/saveload/vehicle_sl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index b42a866a3..6da47fee4 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -150,7 +150,7 @@ void ConvertOldMultiheadToNew() u->SetWagon(); u->SetFreeWagon(); break; - default: NOT_REACHED(); + default: SlErrorCorrupt("Invalid train subtype"); } } } @@ -714,7 +714,7 @@ void Load_VEHS() case VEH_EFFECT: v = new (index) EffectVehicle(); break; case VEH_DISASTER: v = new (index) DisasterVehicle(); break; case VEH_INVALID: // Savegame shouldn't contain invalid vehicles - default: NOT_REACHED(); + default: SlErrorCorrupt("Invalid vehicle type"); } SlObject(v, GetVehicleDescription(vtype)); |