summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/fios.h2
-rw-r--r--src/fios_gui.cpp2
-rw-r--r--src/saveload/map_sl.cpp26
3 files changed, 21 insertions, 9 deletions
diff --git a/src/fios.h b/src/fios.h
index 1a706b796..415bcb8bb 100644
--- a/src/fios.h
+++ b/src/fios.h
@@ -26,6 +26,8 @@ struct LoadCheckData {
StringID error; ///< Error message from loading. INVALID_STRING_ID if no error.
char *error_data; ///< Data to pass to SetDParamStr when displaying #error.
+ uint32 map_size_x, map_size_y;
+
LoadCheckData() : error_data(NULL)
{
this->Clear();
diff --git a/src/fios_gui.cpp b/src/fios_gui.cpp
index 22c2c0119..97b67438c 100644
--- a/src/fios_gui.cpp
+++ b/src/fios_gui.cpp
@@ -44,6 +44,8 @@ void LoadCheckData::Clear()
this->error = INVALID_STRING_ID;
free(this->error_data);
this->error_data = NULL;
+
+ this->map_size_x = this->map_size_y = 256; // Default for old savegames which do not store mapsize.
}
diff --git a/src/saveload/map_sl.cpp b/src/saveload/map_sl.cpp
index abff868ff..c1463b727 100644
--- a/src/saveload/map_sl.cpp
+++ b/src/saveload/map_sl.cpp
@@ -13,6 +13,7 @@
#include "../map_func.h"
#include "../core/alloc_type.hpp"
#include "../core/bitmath_func.hpp"
+#include "../fios.h"
#include "saveload.h"
@@ -38,6 +39,13 @@ static void Load_MAPS()
AllocateMap(_map_dim_x, _map_dim_y);
}
+static void Check_MAPS()
+{
+ SlGlobList(_map_dimensions);
+ _load_check_data.map_size_x = _map_dim_x;
+ _load_check_data.map_size_y = _map_dim_y;
+}
+
static const uint MAP_SL_BUF_SIZE = 4096;
static void Load_MAPT()
@@ -241,13 +249,13 @@ static void Save_MAP7()
}
extern const ChunkHandler _map_chunk_handlers[] = {
- { 'MAPS', Save_MAPS, Load_MAPS, NULL, NULL, CH_RIFF },
- { 'MAPT', Save_MAPT, Load_MAPT, NULL, NULL, CH_RIFF },
- { 'MAPO', Save_MAP1, Load_MAP1, NULL, NULL, CH_RIFF },
- { 'MAP2', Save_MAP2, Load_MAP2, NULL, NULL, CH_RIFF },
- { 'M3LO', Save_MAP3, Load_MAP3, NULL, NULL, CH_RIFF },
- { 'M3HI', Save_MAP4, Load_MAP4, NULL, NULL, CH_RIFF },
- { 'MAP5', Save_MAP5, Load_MAP5, NULL, NULL, CH_RIFF },
- { 'MAPE', Save_MAP6, Load_MAP6, NULL, NULL, CH_RIFF },
- { 'MAP7', Save_MAP7, Load_MAP7, NULL, NULL, CH_RIFF | CH_LAST },
+ { 'MAPS', Save_MAPS, Load_MAPS, NULL, Check_MAPS, CH_RIFF },
+ { 'MAPT', Save_MAPT, Load_MAPT, NULL, NULL, CH_RIFF },
+ { 'MAPO', Save_MAP1, Load_MAP1, NULL, NULL, CH_RIFF },
+ { 'MAP2', Save_MAP2, Load_MAP2, NULL, NULL, CH_RIFF },
+ { 'M3LO', Save_MAP3, Load_MAP3, NULL, NULL, CH_RIFF },
+ { 'M3HI', Save_MAP4, Load_MAP4, NULL, NULL, CH_RIFF },
+ { 'MAP5', Save_MAP5, Load_MAP5, NULL, NULL, CH_RIFF },
+ { 'MAPE', Save_MAP6, Load_MAP6, NULL, NULL, CH_RIFF },
+ { 'MAP7', Save_MAP7, Load_MAP7, NULL, NULL, CH_RIFF | CH_LAST },
};