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

Codechange: Replace while loop with Map::Iterate()

pull/13151/head
SamuXarick 2024-10-27 19:49:34 +00:00 committed by rubidium42
parent 10e2d1ca36
commit 7d0b1cd002
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/economy.cpp
View File

@ -489,19 +489,16 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
/* Change ownership of tiles */ /* Change ownership of tiles */
{ {
TileIndex tile = 0; for (const auto tile : Map::Iterate()) {
do {
ChangeTileOwner(tile, old_owner, new_owner); ChangeTileOwner(tile, old_owner, new_owner);
} while (++tile != Map::Size()); }
if (new_owner != INVALID_OWNER) { if (new_owner != INVALID_OWNER) {
/* Update all signals because there can be new segment that was owned by two companies /* Update all signals because there can be new segment that was owned by two companies
* and signals were not propagated * and signals were not propagated
* Similar with crossings - it is needed to bar crossings that weren't before * Similar with crossings - it is needed to bar crossings that weren't before
* because of different owner of crossing and approaching train */ * because of different owner of crossing and approaching train */
tile = 0; for (const auto tile : Map::Iterate()) {
do {
if (IsTileType(tile, MP_RAILWAY) && IsTileOwner(tile, new_owner) && HasSignals(tile)) { if (IsTileType(tile, MP_RAILWAY) && IsTileOwner(tile, new_owner) && HasSignals(tile)) {
TrackBits tracks = GetTrackBits(tile); TrackBits tracks = GetTrackBits(tile);
do { // there may be two tracks with signals for TRACK_BIT_HORZ and TRACK_BIT_VERT do { // there may be two tracks with signals for TRACK_BIT_HORZ and TRACK_BIT_VERT
@ -511,7 +508,7 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
} else if (IsLevelCrossingTile(tile) && IsTileOwner(tile, new_owner)) { } else if (IsLevelCrossingTile(tile) && IsTileOwner(tile, new_owner)) {
UpdateLevelCrossing(tile); UpdateLevelCrossing(tile);
} }
} while (++tile != Map::Size()); }
} }
/* update signals in buffer */ /* update signals in buffer */