(svn r2819) Make variables, which are exclusive for internal use of the save/load code, static in saveload.c

1 files changed, 131 insertions, 30 deletions

diff --git a/misc.c b/misc.c
index 9e32bd0d6..54b9c1ea5 100644
--- a/misc.c
+++ b/misc.c
@@ -741,33 +741,62 @@ static void Load_MAPS(void)
 	AllocateMap(_map_dim_x, _map_dim_y);
 }
 
+static void Load_MAPT(void)
+{
+	uint size = MapSize();
+	uint i;
+
+	for (i = 0; i != size;) {
+		byte buf[4096];
+		uint j;
 
-static void SaveLoad_MapByte(byte *m)
+		SlArray(buf, lengthof(buf), SLE_UINT8);
+		for (j = 0; j != lengthof(buf); j++) _m[i++].type_height = buf[j];
+	}
+}
+
+static void Save_MAPT(void)
 {
-	uint size = MapSize(), i;
-	byte buf[4096];
-	if (_sl.save) {
-		SlSetLength(size);
-		for(;size;size -= lengthof(buf)) {
-			for (i = 0; i != lengthof(buf); i++) { buf[i] = *m; m += sizeof(Tile); }
-			SlArray(buf, lengthof(buf), SLE_UINT8);
-		}
-	} else {
-		for(;size;size -= lengthof(buf)) {
-			SlArray(buf, lengthof(buf), SLE_UINT8);
-			for (i = 0; i != lengthof(buf); i++) { *m = buf[i]; m += sizeof(Tile); }
-		}
+	uint size = MapSize();
+	uint i;
+
+	SlSetLength(size);
+	for (i = 0; i != size;) {
+		byte buf[4096];
+		uint j;
+
+		for (j = 0; j != lengthof(buf); j++) buf[j] = _m[i++].type_height;
+		SlArray(buf, lengthof(buf), SLE_UINT8);
 	}
 }
 
-static void SaveLoad_MAPT(void)
+static void Load_MAPO(void)
 {
-	SaveLoad_MapByte(&_m[0].type_height);
+	uint size = MapSize();
+	uint i;
+
+	for (i = 0; i != size;) {
+		byte buf[4096];
+		uint j;
+
+		SlArray(buf, lengthof(buf), SLE_UINT8);
+		for (j = 0; j != lengthof(buf); j++) _m[i++].owner = buf[j];
+	}
 }
 
-static void SaveLoad_MAPO(void)
+static void Save_MAPO(void)
 {
-	SaveLoad_MapByte(&_m[0].owner);
+	uint size = MapSize();
+	uint i;
+
+	SlSetLength(size);
+	for (i = 0; i != size;) {
+		byte buf[4096];
+		uint j;
+
+		for (j = 0; j != lengthof(buf); j++) buf[j] = _m[i++].owner;
+		SlArray(buf, lengthof(buf), SLE_UINT8);
+	}
 }
 
 static void Load_MAP2(void)
@@ -781,7 +810,7 @@ static void Load_MAP2(void)
 
 		SlArray(buf, lengthof(buf),
 			/* In those versions the m2 was 8 bits */
-			_sl.version < 5 ? SLE_FILE_U8 | SLE_VAR_U16 : SLE_UINT16
+			_sl_version < 5 ? SLE_FILE_U8 | SLE_VAR_U16 : SLE_UINT16
 		);
 		for (j = 0; j != lengthof(buf); j++) _m[i++].m2 = buf[j];
 	}
@@ -802,19 +831,91 @@ static void Save_MAP2(void)
 	}
 }
 
-static void SaveLoad_MAP3(void)
+static void Load_MAP3(void)
 {
-	SaveLoad_MapByte(&_m[0].m3);
+	uint size = MapSize();
+	uint i;
+
+	for (i = 0; i != size;) {
+		byte buf[4096];
+		uint j;
+
+		SlArray(buf, lengthof(buf), SLE_UINT8);
+		for (j = 0; j != lengthof(buf); j++) _m[i++].m3 = buf[j];
+	}
 }
 
-static void SaveLoad_MAP4(void)
+static void Save_MAP3(void)
 {
-	SaveLoad_MapByte(&_m[0].m4);
+	uint size = MapSize();
+	uint i;
+
+	SlSetLength(size);
+	for (i = 0; i != size;) {
+		byte buf[4096];
+		uint j;
+
+		for (j = 0; j != lengthof(buf); j++) buf[j] = _m[i++].m3;
+		SlArray(buf, lengthof(buf), SLE_UINT8);
+	}
+}
+
+static void Load_MAP4(void)
+{
+	uint size = MapSize();
+	uint i;
+
+	for (i = 0; i != size;) {
+		byte buf[4096];
+		uint j;
+
+		SlArray(buf, lengthof(buf), SLE_UINT8);
+		for (j = 0; j != lengthof(buf); j++) _m[i++].m4 = buf[j];
+	}
+}
+
+static void Save_MAP4(void)
+{
+	uint size = MapSize();
+	uint i;
+
+	SlSetLength(size);
+	for (i = 0; i != size;) {
+		byte buf[4096];
+		uint j;
+
+		for (j = 0; j != lengthof(buf); j++) buf[j] = _m[i++].m4;
+		SlArray(buf, lengthof(buf), SLE_UINT8);
+	}
 }
 
-static void SaveLoad_MAP5(void)
+static void Load_MAP5(void)
 {
-	SaveLoad_MapByte(&_m[0].m5);
+	uint size = MapSize();
+	uint i;
+
+	for (i = 0; i != size;) {
+		byte buf[4096];
+		uint j;
+
+		SlArray(buf, lengthof(buf), SLE_UINT8);
+		for (j = 0; j != lengthof(buf); j++) _m[i++].m5 = buf[j];
+	}
+}
+
+static void Save_MAP5(void)
+{
+	uint size = MapSize();
+	uint i;
+
+	SlSetLength(size);
+	for (i = 0; i != size;) {
+		byte buf[4096];
+		uint j;
+
+		for (j = 0; j != lengthof(buf); j++) buf[j] = _m[i++].m5;
+		SlArray(buf, lengthof(buf), SLE_UINT8);
+	}
 }
 
 static void Load_MAPE(void)
@@ -885,12 +986,12 @@ static void Load_CHTS(void)
 
 const ChunkHandler _misc_chunk_handlers[] = {
 	{ 'MAPS', Save_MAPS, Load_MAPS, CH_RIFF },
-	{ 'MAPT', SaveLoad_MAPT, SaveLoad_MAPT, CH_RIFF },
-	{ 'MAPO', SaveLoad_MAPO, SaveLoad_MAPO, CH_RIFF },
+	{ 'MAPT', Save_MAPT, Load_MAPT, CH_RIFF },
+	{ 'MAPO', Save_MAPO, Load_MAPO, CH_RIFF },
 	{ 'MAP2', Save_MAP2, Load_MAP2, CH_RIFF },
-	{ 'M3LO', SaveLoad_MAP3, SaveLoad_MAP3, CH_RIFF },
-	{ 'M3HI', SaveLoad_MAP4, SaveLoad_MAP4, CH_RIFF },
-	{ 'MAP5', SaveLoad_MAP5, SaveLoad_MAP5, CH_RIFF },
+	{ 'M3LO', Save_MAP3, Load_MAP3, CH_RIFF },
+	{ 'M3HI', Save_MAP4, Load_MAP4, CH_RIFF },
+	{ 'MAP5', Save_MAP5, Load_MAP5, CH_RIFF },
 	{ 'MAPE', Save_MAPE, Load_MAPE, CH_RIFF },
 
 	{ 'NAME', Save_NAME, Load_NAME, CH_ARRAY},