1 files changed, 17 insertions, 22 deletions

diff --git a/misc.c b/misc.c
index 689340d3d..71e9e25fa 100644
--- a/misc.c
+++ b/misc.c
@@ -859,26 +859,16 @@ static void Load_MAPE(void)
 	uint size = MapSize();
 	uint i;
 
-	if (CheckSavegameVersion(29)) {
-		for (i = 0; i != size;) {
-			uint8 buf[1024];
-			uint j;
-
-			SlArray(buf, lengthof(buf), SLE_UINT8);
-			for (j = 0; j != lengthof(buf); j++) {
-				_m[i++].extra = GB(buf[j], 0, 2);
-				_m[i++].extra = GB(buf[j], 2, 2);
-				_m[i++].extra = GB(buf[j], 4, 2);
-				_m[i++].extra = GB(buf[j], 6, 2);
-			}
-		}
-	} else {
-		for (i = 0; i != size;) {
-			byte buf[4096];
-			uint j;
+	for (i = 0; i != size;) {
+		uint8 buf[1024];
+		uint j;
 
-			SlArray(buf, lengthof(buf), SLE_UINT8);
-			for (j = 0; j != lengthof(buf); j++) _m[i++].extra = buf[j];
+		SlArray(buf, lengthof(buf), SLE_UINT8);
+		for (j = 0; j != lengthof(buf); j++) {
+			_m[i++].extra = GB(buf[j], 0, 2);
+			_m[i++].extra = GB(buf[j], 2, 2);
+			_m[i++].extra = GB(buf[j], 4, 2);
+			_m[i++].extra = GB(buf[j], 6, 2);
 		}
 	}
 }
@@ -888,12 +878,17 @@ static void Save_MAPE(void)
 	uint size = MapSize();
 	uint i;
 
-	SlSetLength(size);
+	SlSetLength(size / 4);
 	for (i = 0; i != size;) {
-		uint8 buf[4096];
+		uint8 buf[1024];
 		uint j;
 
-		for (j = 0; j != lengthof(buf); j++) buf[j] = _m[i++].extra;
+		for (j = 0; j != lengthof(buf); j++) {
+			buf[j]  = _m[i++].extra << 0;
+			buf[j] |= _m[i++].extra << 2;
+			buf[j] |= _m[i++].extra << 4;
+			buf[j] |= _m[i++].extra << 6;
+		}
 		SlArray(buf, lengthof(buf), SLE_UINT8);
 	}
 }