mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r19976) -Add: Read mapsize during SL_LOAD_CHECK.

This commit is contained in:
frosch 2010-06-13 14:13:49 +00:00
parent 8d9b573f8f
commit 2d8c2af5e9
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fios.h
View File

@ -26,6 +26,8 @@ struct LoadCheckData {
StringID error; ///< Error message from loading. INVALID_STRING_ID if no error. StringID error; ///< Error message from loading. INVALID_STRING_ID if no error.
char *error_data; ///< Data to pass to SetDParamStr when displaying #error. char *error_data; ///< Data to pass to SetDParamStr when displaying #error.
uint32 map_size_x, map_size_y;
LoadCheckData() : error_data(NULL) LoadCheckData() : error_data(NULL)
{ {
this->Clear(); this->Clear();

2
src/fios_gui.cpp
View File

@ -44,6 +44,8 @@ void LoadCheckData::Clear()
this->error = INVALID_STRING_ID; this->error = INVALID_STRING_ID;
free(this->error_data); free(this->error_data);
this->error_data = NULL; this->error_data = NULL;
this->map_size_x = this->map_size_y = 256; // Default for old savegames which do not store mapsize.
} }

26
src/saveload/map_sl.cpp
View File

@ -13,6 +13,7 @@
#include "../map_func.h" #include "../map_func.h"
#include "../core/alloc_type.hpp" #include "../core/alloc_type.hpp"
#include "../core/bitmath_func.hpp" #include "../core/bitmath_func.hpp"
#include "../fios.h"
#include "saveload.h" #include "saveload.h"
@ -38,6 +39,13 @@ static void Load_MAPS()
AllocateMap(_map_dim_x, _map_dim_y); 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 const uint MAP_SL_BUF_SIZE = 4096;
static void Load_MAPT() static void Load_MAPT()
@ -241,13 +249,13 @@ static void Save_MAP7()
} }
extern const ChunkHandler _map_chunk_handlers[] = { extern const ChunkHandler _map_chunk_handlers[] = {
{ 'MAPS', Save_MAPS, Load_MAPS, NULL, NULL, CH_RIFF }, { 'MAPS', Save_MAPS, Load_MAPS, NULL, Check_MAPS, CH_RIFF },
{ 'MAPT', Save_MAPT, Load_MAPT, NULL, NULL, CH_RIFF }, { 'MAPT', Save_MAPT, Load_MAPT, NULL, NULL, CH_RIFF },
{ 'MAPO', Save_MAP1, Load_MAP1, NULL, NULL, CH_RIFF }, { 'MAPO', Save_MAP1, Load_MAP1, NULL, NULL, CH_RIFF },
{ 'MAP2', Save_MAP2, Load_MAP2, NULL, NULL, CH_RIFF }, { 'MAP2', Save_MAP2, Load_MAP2, NULL, NULL, CH_RIFF },
{ 'M3LO', Save_MAP3, Load_MAP3, NULL, NULL, CH_RIFF }, { 'M3LO', Save_MAP3, Load_MAP3, NULL, NULL, CH_RIFF },
{ 'M3HI', Save_MAP4, Load_MAP4, NULL, NULL, CH_RIFF }, { 'M3HI', Save_MAP4, Load_MAP4, NULL, NULL, CH_RIFF },
{ 'MAP5', Save_MAP5, Load_MAP5, NULL, NULL, CH_RIFF }, { 'MAP5', Save_MAP5, Load_MAP5, NULL, NULL, CH_RIFF },
{ 'MAPE', Save_MAP6, Load_MAP6, NULL, NULL, CH_RIFF }, { 'MAPE', Save_MAP6, Load_MAP6, NULL, NULL, CH_RIFF },
{ 'MAP7', Save_MAP7, Load_MAP7, NULL, NULL, CH_RIFF | CH_LAST }, { 'MAP7', Save_MAP7, Load_MAP7, NULL, NULL, CH_RIFF | CH_LAST },
}; };