diff --git a/src/saveload/map_sl.cpp b/src/saveload/map_sl.cpp --- a/src/saveload/map_sl.cpp +++ b/src/saveload/map_sl.cpp @@ -53,7 +53,7 @@ static void Load_MAPT() TileIndex size = MapSize(); for (TileIndex i = 0; i != size;) { - SlArray(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); + SlCopy(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) _m[i++].type = buf[j]; } } @@ -66,7 +66,7 @@ static void Save_MAPT() SlSetLength(size); for (TileIndex i = 0; i != size;) { for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) buf[j] = _m[i++].type; - SlArray(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); + SlCopy(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); } } @@ -76,7 +76,7 @@ static void Load_MAPH() TileIndex size = MapSize(); for (TileIndex i = 0; i != size;) { - SlArray(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); + SlCopy(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) _m[i++].height = buf[j]; } } @@ -89,7 +89,7 @@ static void Save_MAPH() SlSetLength(size); for (TileIndex i = 0; i != size;) { for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) buf[j] = _m[i++].height; - SlArray(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); + SlCopy(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); } } @@ -99,7 +99,7 @@ static void Load_MAP1() TileIndex size = MapSize(); for (TileIndex i = 0; i != size;) { - SlArray(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); + SlCopy(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) _m[i++].m1 = buf[j]; } } @@ -112,7 +112,7 @@ static void Save_MAP1() SlSetLength(size); for (TileIndex i = 0; i != size;) { for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) buf[j] = _m[i++].m1; - SlArray(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); + SlCopy(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); } } @@ -122,7 +122,7 @@ static void Load_MAP2() TileIndex size = MapSize(); for (TileIndex i = 0; i != size;) { - SlArray(buf.data(), MAP_SL_BUF_SIZE, + SlCopy(buf.data(), MAP_SL_BUF_SIZE, /* In those versions the m2 was 8 bits */ IsSavegameVersionBefore(SLV_5) ? SLE_FILE_U8 | SLE_VAR_U16 : SLE_UINT16 ); @@ -138,7 +138,7 @@ static void Save_MAP2() SlSetLength(size * sizeof(uint16)); for (TileIndex i = 0; i != size;) { for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) buf[j] = _m[i++].m2; - SlArray(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT16); + SlCopy(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT16); } } @@ -148,7 +148,7 @@ static void Load_MAP3() TileIndex size = MapSize(); for (TileIndex i = 0; i != size;) { - SlArray(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); + SlCopy(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) _m[i++].m3 = buf[j]; } } @@ -161,7 +161,7 @@ static void Save_MAP3() SlSetLength(size); for (TileIndex i = 0; i != size;) { for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) buf[j] = _m[i++].m3; - SlArray(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); + SlCopy(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); } } @@ -171,7 +171,7 @@ static void Load_MAP4() TileIndex size = MapSize(); for (TileIndex i = 0; i != size;) { - SlArray(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); + SlCopy(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) _m[i++].m4 = buf[j]; } } @@ -184,7 +184,7 @@ static void Save_MAP4() SlSetLength(size); for (TileIndex i = 0; i != size;) { for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) buf[j] = _m[i++].m4; - SlArray(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); + SlCopy(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); } } @@ -194,7 +194,7 @@ static void Load_MAP5() TileIndex size = MapSize(); for (TileIndex i = 0; i != size;) { - SlArray(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); + SlCopy(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) _m[i++].m5 = buf[j]; } } @@ -207,7 +207,7 @@ static void Save_MAP5() SlSetLength(size); for (TileIndex i = 0; i != size;) { for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) buf[j] = _m[i++].m5; - SlArray(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); + SlCopy(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); } } @@ -219,7 +219,7 @@ static void Load_MAP6() if (IsSavegameVersionBefore(SLV_42)) { for (TileIndex i = 0; i != size;) { /* 1024, otherwise we overflow on 64x64 maps! */ - SlArray(buf.data(), 1024, SLE_UINT8); + SlCopy(buf.data(), 1024, SLE_UINT8); for (uint j = 0; j != 1024; j++) { _me[i++].m6 = GB(buf[j], 0, 2); _me[i++].m6 = GB(buf[j], 2, 2); @@ -229,7 +229,7 @@ static void Load_MAP6() } } else { for (TileIndex i = 0; i != size;) { - SlArray(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); + SlCopy(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) _me[i++].m6 = buf[j]; } } @@ -243,7 +243,7 @@ static void Save_MAP6() SlSetLength(size); for (TileIndex i = 0; i != size;) { for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) buf[j] = _me[i++].m6; - SlArray(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); + SlCopy(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); } } @@ -253,7 +253,7 @@ static void Load_MAP7() TileIndex size = MapSize(); for (TileIndex i = 0; i != size;) { - SlArray(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); + SlCopy(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) _me[i++].m7 = buf[j]; } } @@ -266,7 +266,7 @@ static void Save_MAP7() 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.data(), MAP_SL_BUF_SIZE, SLE_UINT8); + SlCopy(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT8); } } @@ -276,7 +276,7 @@ static void Load_MAP8() TileIndex size = MapSize(); for (TileIndex i = 0; i != size;) { - SlArray(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT16); + SlCopy(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT16); for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) _me[i++].m8 = buf[j]; } } @@ -289,7 +289,7 @@ static void Save_MAP8() SlSetLength(size * sizeof(uint16)); for (TileIndex i = 0; i != size;) { for (uint j = 0; j != MAP_SL_BUF_SIZE; j++) buf[j] = _me[i++].m8; - SlArray(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT16); + SlCopy(buf.data(), MAP_SL_BUF_SIZE, SLE_UINT16); } }