cpp/openttd-patchpack/source File Diff

File diff r15576:a72a8cf9455f → r15577:a61e44bed2f3

src/saveload/oldloader_sl.cpp

➞

Show inline comments

@@ @@ -1479,7 +1479,7 @@ static bool LoadOldMapPart1(LoadgameStat @@
+		}
+	}
-	return !ls->failed;
+	return true;
+}
 static bool LoadOldMapPart2(LoadgameState *ls, int num)
@@ @@ -1493,7 +1493,7 @@ static bool LoadOldMapPart2(LoadgameStat @@
 		_m[i].m5 = ReadByte(ls);
+	}
-	return !ls->failed;
+	return true;
+}
 static bool LoadTTDPatchExtraChunks(LoadgameState *ls, int num)
@@ @@ -1548,7 +1548,7 @@ static bool LoadTTDPatchExtraChunks(Load @@
+		}
+	}
-	return !ls->failed;
+	return true;
+}
 extern TileIndex _cur_tileloop_tile;
@@ @@ -1734,11 +1734,17 @@ bool LoadTTDMain(LoadgameState *ls) @@
 	SmallStackSafeStackAlloc<byte, OLD_MAP_SIZE * 2> map3;
 	_old_map3 = map3.data;
 	_old_vehicle_names = NULL;
 	if (!LoadChunk(ls, NULL, main_chunk)) {
 		DEBUG(oldloader, 0, "Loading failed");
 	try {
 		if (!LoadChunk(ls, NULL, main_chunk)) {
 			DEBUG(oldloader, 0, "Loading failed");
 			free(_old_vehicle_names);
 			return false;
+		}
 	} catch (...) {
 		free(_old_vehicle_names);
-		return false;
+		throw;
+	}
 	DEBUG(oldloader, 3, "Done, converting game data...");
 	FixTTDMapArray();