cpp/openttd-patchpack/source Changeset - r15325:2c8e92d40538

Changeset - r15325:2c8e92d40538

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

frosch - 14 years ago 2010-06-13 14:13:49
frosch@openttd.org

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

3 files changed with 13 insertions and 1 deletions:

src/fios.h

src/fios_gui.cpp

src/saveload/map_sl.cpp

0 comments (0 inline, 0 general)

src/fios.h

➞

Show inline comments

@@ @@ -17,24 +17,26 @@ @@
 #include "core/enum_type.hpp"
 #include "gfx_type.h"
 /**
  * Container for loading in mode SL_LOAD_CHECK.
  */
 struct LoadCheckData {
 	bool checkable;     ///< True if the savegame could be checked by SL_LOAD_CHECK. (Old savegames are not checkable.)
 	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();
+	}
 	void Clear();
 };
 extern LoadCheckData _load_check_data;
 enum FileSlots {

src/fios_gui.cpp

➞

Show inline comments

@@ @@ -35,24 +35,26 @@ static bool _fios_path_changed; @@
 static bool _savegame_sort_dirty;
 /**
  * Reset read data.
  */
 void LoadCheckData::Clear()
+{
 	this->checkable = false;
 	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.
+}
 enum SaveLoadWindowWidgets {
 	SLWW_WINDOWTITLE,
 	SLWW_SORT_BYNAME,
 	SLWW_SORT_BYDATE,
 	SLWW_BACKGROUND,
 	SLWW_FILE_BACKGROUND,
 	SLWW_HOME_BUTTON,
 	SLWW_DRIVES_DIRECTORIES_LIST,
 	SLWW_SCROLLBAR,

src/saveload/map_sl.cpp

➞

Show inline comments

@@ @@ -4,24 +4,25 @@ @@
  * This file is part of OpenTTD.
  * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file map_sl.cpp Code handling saving and loading of map */
 #include "../stdafx.h"
 #include "../map_func.h"
 #include "../core/alloc_type.hpp"
 #include "../core/bitmath_func.hpp"
 #include "../fios.h"
 #include "saveload.h"
 static uint32 _map_dim_x;
 static uint32 _map_dim_y;
 static const SaveLoadGlobVarList _map_dimensions[] = {
 	SLEG_CONDVAR(_map_dim_x, SLE_UINT32, 6, SL_MAX_VERSION),
 	SLEG_CONDVAR(_map_dim_y, SLE_UINT32, 6, SL_MAX_VERSION),
 	    SLEG_END()
 };
@@ @@ -29,24 +30,31 @@ static void Save_MAPS() @@
+{
 	_map_dim_x = MapSizeX();
 	_map_dim_y = MapSizeY();
 	SlGlobList(_map_dimensions);
+}
 static void Load_MAPS()
+{
 	SlGlobList(_map_dimensions);
 	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()
+{
 	SmallStackSafeStackAlloc<byte, MAP_SL_BUF_SIZE> buf;
 	TileIndex size = MapSize();
 	for (TileIndex i = 0; i != size;) {
 		SlArray(buf, MAP_SL_BUF_SIZE, SLE_UINT8);
 		for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) _m[i++].type_height = buf[j];
+	}
+}
@@ @@ -232,22 +240,22 @@ static void Save_MAP7() @@
+{
 	SmallStackSafeStackAlloc<byte, MAP_SL_BUF_SIZE> buf;
 	TileIndex size = MapSize();
 	SlSetLength(size);
 	for (TileIndex i = 0; i != size;) {
 		for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) buf[j] = _me[i++].m7;
 		SlArray(buf, MAP_SL_BUF_SIZE, SLE_UINT8);
+	}
+}
 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 },
 	{ '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 },
 };

0 comments (0 inline, 0 general)