summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/oldloader.cpp34
-rw-r--r--src/saveload.cpp7
-rw-r--r--src/saveload.h7
3 files changed, 35 insertions, 13 deletions
diff --git a/src/oldloader.cpp b/src/oldloader.cpp
index dd4924a8f..30fcdbddc 100644
--- a/src/oldloader.cpp
+++ b/src/oldloader.cpp
@@ -24,6 +24,7 @@
#include "date_func.h"
#include "vehicle_func.h"
#include "variables.h"
+#include "saveload.h"
#include "strings_func.h"
#include "effectvehicle_base.h"
@@ -111,6 +112,9 @@ struct OldChunks {
/* If it fails, check lines above.. */
assert_compile(sizeof(TileIndex) == 4);
+extern SavegameType _savegame_type;
+extern uint32 _ttdp_version;
+
static uint32 _bump_assert_value;
static bool _read_ttdpatch_flags;
@@ -295,6 +299,9 @@ static void InitLoading(LoadgameState *ls)
_bump_assert_value = 0;
+ _savegame_type = SGT_TTD;
+ _ttdp_version = 0;
+
_read_ttdpatch_flags = false;
}
@@ -403,7 +410,6 @@ extern char *_old_name_array;
static byte _old_vehicle_multiplier;
static uint8 *_old_map3;
-static bool _new_ttdpatch_format;
static uint32 _old_town_index;
static uint16 _old_string_id;
static uint16 _old_string_id_2;
@@ -411,8 +417,6 @@ static uint16 _old_extra_chunk_nums;
static void ReadTTDPatchFlags()
{
- int i;
-
if (_read_ttdpatch_flags) return;
_read_ttdpatch_flags = true;
@@ -430,16 +434,20 @@ static void ReadTTDPatchFlags()
1 vehicle == 128 bytes */
_bump_assert_value = (_old_vehicle_multiplier - 1) * 850 * 128;
+ for (uint i = 0; i < 17; i++) { // check tile 0, too
+ if (_old_map3[i] != 0) _savegame_type = SGT_TTDP1;
+ }
+
/* Check if we have a modern TTDPatch savegame (has extra data all around) */
- _new_ttdpatch_format = (memcmp(&_old_map3[0x1FFFA], "TTDp", 4) == 0);
+ if (memcmp(&_old_map3[0x1FFFA], "TTDp", 4) == 0) _savegame_type = SGT_TTDP2;
- _old_extra_chunk_nums = _old_map3[_new_ttdpatch_format ? 0x1FFFE : 0x2];
+ _old_extra_chunk_nums = _old_map3[_savegame_type == SGT_TTDP2 ? 0x1FFFE : 0x2];
/* Clean the misused places */
- for (i = 0; i < 17; i++) _old_map3[i] = 0;
- for (i = 0x1FE00; i < 0x20000; i++) _old_map3[i] = 0;
+ for (uint i = 0; i < 17; i++) _old_map3[i] = 0;
+ for (uint i = 0x1FE00; i < 0x20000; i++) _old_map3[i] = 0;
- if (_new_ttdpatch_format) DEBUG(oldloader, 2, "Found TTDPatch game");
+ if (_savegame_type == SGT_TTDP2) DEBUG(oldloader, 2, "Found TTDPatch game");
DEBUG(oldloader, 3, "Vehicle-multiplier is set to %d (%d vehicles)", _old_vehicle_multiplier, _old_vehicle_multiplier * 850);
}
@@ -1465,12 +1473,12 @@ static bool LoadTTDPatchExtraChunks(LoadgameState *ls, int num)
} break;
/* TTDPatch version and configuration */
- case 0x3: {
- uint32 ttdpv = ReadUint32(ls);
- DEBUG(oldloader, 3, "Game saved with TTDPatch version %d.%d.%d r%d", GB(ttdpv, 24, 8), GB(ttdpv, 20, 4), GB(ttdpv, 16, 4), GB(ttdpv, 0, 16));
+ case 0x3:
+ _ttdp_version = ReadUint32(ls);
+ DEBUG(oldloader, 3, "Game saved with TTDPatch version %d.%d.%d r%d",
+ GB(_ttdp_version, 24, 8), GB(_ttdp_version, 20, 4), GB(_ttdp_version, 16, 4), GB(_ttdp_version, 0, 16));
len -= 4;
while (len-- != 0) ReadByte(ls); // skip the configuration
- } break;
default:
DEBUG(oldloader, 4, "Skipping unknown extra chunk %X", id);
@@ -1706,7 +1714,7 @@ bool LoadOldSaveGame(const char *file)
fclose(ls.file);
- /* Some old TTDP savegames could have buoys at tile 0
+ /* Some old TTD(Patch) savegames could have buoys at tile 0
* (without assigned station struct)
* MakeWater() can be used as long as sea has the same
* format as old savegames (eg. everything is zeroed) */
diff --git a/src/saveload.cpp b/src/saveload.cpp
index f6edcf578..ff2c4b3fb 100644
--- a/src/saveload.cpp
+++ b/src/saveload.cpp
@@ -35,6 +35,10 @@
#include "table/strings.h"
extern const uint16 SAVEGAME_VERSION = 95;
+
+SavegameType _savegame_type; ///< type of savegame we are loading
+
+uint32 _ttdp_version; ///< version of TTDP savegame (if applicable)
uint16 _sl_version; ///< the major savegame version identifier
byte _sl_minor_version; ///< the minor savegame version, DO NOT USE!
@@ -1632,6 +1636,7 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb)
InitializeGame(IG_DATE_RESET, 256, 256); // set a mapsize of 256x256 for TTDPatch games or it might get confused
if (!LoadOldSaveGame(filename)) return SL_REINIT;
_sl_version = 0;
+ _sl_minor_version = 0;
if (!AfterLoadGame()) return SL_REINIT;
return SL_OK;
}
@@ -1747,6 +1752,8 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb)
fmt->uninit_read();
fclose(_sl.fh);
+ _savegame_type = SGT_OTTD;
+
/* After loading fix up savegame for any internal changes that
* might've occured since then. If it fails, load back the old game */
if (!AfterLoadGame()) return SL_REINIT;
diff --git a/src/saveload.h b/src/saveload.h
index 102c9a04f..c55a1df51 100644
--- a/src/saveload.h
+++ b/src/saveload.h
@@ -28,6 +28,13 @@ enum SaveOrLoadMode {
SL_BMP = 4,
};
+enum SavegameType {
+ SGT_TTD, ///< TTD savegame (can be detected incorrectly)
+ SGT_TTDP1, ///< TTDP savegame ( -//- ) (data at NW border)
+ SGT_TTDP2, ///< TTDP savegame in new format (data at SE border)
+ SGT_OTTD ///< OTTD savegame
+};
+
void SetSaveLoadError(uint16 str);
const char *GetSaveLoadErrorString();
SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb);