mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: use range based for loop, instead of tile numbers

pull/11795/head
Rubidium 2024-01-15 18:39:31 +01:00 committed by rubidium42
parent b09a4384d9
commit f5b320e502
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/saveload/oldloader_sl.cpp
View File

@ -52,8 +52,7 @@ void FixOldMapArray()
static void FixTTDMapArray() static void FixTTDMapArray()
{ {
for (TileIndex t = 0; t < OLD_MAP_SIZE; t++) { for (auto tile : Map::Iterate()) {
Tile tile(t);
switch (GetTileType(tile)) { switch (GetTileType(tile)) {
case MP_STATION: case MP_STATION:
tile.m4() = 0; // We do not understand this TTDP station mapping (yet) tile.m4() = 0; // We do not understand this TTDP station mapping (yet)
@ -213,8 +212,7 @@ void FixOldVehicles()
static bool FixTTOMapArray() static bool FixTTOMapArray()
{ {
for (TileIndex t = 0; t < OLD_MAP_SIZE; t++) { for (auto tile : Map::Iterate()) {
Tile tile(t);
TileType tt = GetTileType(tile); TileType tt = GetTileType(tile);
if (tt == 11) { if (tt == 11) {
/* TTO has a different way of storing monorail. /* TTO has a different way of storing monorail.
@ -1484,25 +1482,23 @@ static bool LoadOldMapPart1(LoadgameState *ls, int)
Map::Allocate(OLD_MAP_SIZE, OLD_MAP_SIZE); Map::Allocate(OLD_MAP_SIZE, OLD_MAP_SIZE);
} }
for (uint i = 0; i < OLD_MAP_SIZE; i++) { for (auto t : Map::Iterate()) {
Tile(i).m1() = ReadByte(ls); t.m1() = ReadByte(ls);
} }
for (uint i = 0; i < OLD_MAP_SIZE; i++) { for (auto t : Map::Iterate()) {
Tile(i).m2() = ReadByte(ls); t.m2() = ReadByte(ls);
} }
if (_savegame_type != SGT_TTO) { if (_savegame_type != SGT_TTO) {
/* old map3 is split into to m3 and m4 */ /* old map3 is split into to m3 and m4 */
for (uint i = 0; i < OLD_MAP_SIZE; i++) { for (auto t : Map::Iterate()) {
Tile(i).m3() = ReadByte(ls); t.m3() = ReadByte(ls);
Tile(i).m4() = ReadByte(ls); t.m4() = ReadByte(ls);
} }
for (uint i = 0; i < OLD_MAP_SIZE / 4; i++) { auto range = Map::Iterate();
for (auto it = range.begin(); it != range.end(); /* nothing. */) {
byte b = ReadByte(ls); byte b = ReadByte(ls);
Tile(i * 4 + 0).m6() = GB(b, 0, 2); for (int i = 0; i < 8; i += 2, ++it) (*it).m6() = GB(b, i, 2);
Tile(i * 4 + 1).m6() = GB(b, 2, 2);
Tile(i * 4 + 2).m6() = GB(b, 4, 2);
Tile(i * 4 + 3).m6() = GB(b, 6, 2);
} }
} }
@ -1511,13 +1507,11 @@ static bool LoadOldMapPart1(LoadgameState *ls, int)
static bool LoadOldMapPart2(LoadgameState *ls, int) static bool LoadOldMapPart2(LoadgameState *ls, int)
{ {
uint i; for (auto t : Map::Iterate()) {
t.type() = ReadByte(ls);
for (i = 0; i < OLD_MAP_SIZE; i++) {
Tile(i).type() = ReadByte(ls);
} }
for (i = 0; i < OLD_MAP_SIZE; i++) { for (auto t : Map::Iterate()) {
Tile(i).m5() = ReadByte(ls); t.m5() = ReadByte(ls);
} }
return true; return true;