mirror of https://github.com/OpenTTD/OpenTTD.git
Codechange: Replace FOR_ALL_SIGNS with range-based for loops
This commit is contained in:
parent
b91abd3af9
commit
869581eb23
|
@ -521,8 +521,7 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
|
|||
}
|
||||
}
|
||||
|
||||
Sign *si;
|
||||
FOR_ALL_SIGNS(si) {
|
||||
for (Sign *si : Sign::Iterate()) {
|
||||
if (si->owner == old_owner) si->owner = new_owner == INVALID_OWNER ? OWNER_NONE : new_owner;
|
||||
}
|
||||
|
||||
|
|
|
@ -1990,8 +1990,7 @@ bool AfterLoadGame()
|
|||
UpdateNearestTownForRoadTiles(false);
|
||||
|
||||
/* signs with invalid owner left from older savegames */
|
||||
Sign *si;
|
||||
FOR_ALL_SIGNS(si) {
|
||||
for (Sign *si : Sign::Iterate()) {
|
||||
if (si->owner != OWNER_NONE && !Company::IsValidID(si->owner)) si->owner = OWNER_NONE;
|
||||
}
|
||||
|
||||
|
|
|
@ -32,9 +32,7 @@ static const SaveLoad _sign_desc[] = {
|
|||
/** Save all signs */
|
||||
static void Save_SIGN()
|
||||
{
|
||||
Sign *si;
|
||||
|
||||
FOR_ALL_SIGNS(si) {
|
||||
for (Sign *si : Sign::Iterate()) {
|
||||
SlSetArrayIndex(si->index);
|
||||
SlObject(si, _sign_desc);
|
||||
}
|
||||
|
|
|
@ -16,8 +16,7 @@
|
|||
|
||||
ScriptSignList::ScriptSignList()
|
||||
{
|
||||
Sign *s;
|
||||
FOR_ALL_SIGNS(s) {
|
||||
for (const Sign *s : Sign::Iterate()) {
|
||||
if (ScriptSign::IsValidSign(s->index)) this->AddItem(s->index);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -59,9 +59,7 @@ void Sign::UpdateVirtCoord()
|
|||
/** Update the coordinates of all signs */
|
||||
void UpdateAllSignVirtCoords()
|
||||
{
|
||||
Sign *si;
|
||||
|
||||
FOR_ALL_SIGNS(si) {
|
||||
for (Sign *si : Sign::Iterate()) {
|
||||
si->UpdateVirtCoord();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -32,7 +32,4 @@ struct Sign : SignPool::PoolItem<&_sign_pool> {
|
|||
void UpdateVirtCoord();
|
||||
};
|
||||
|
||||
#define FOR_ALL_SIGNS_FROM(var, start) FOR_ALL_ITEMS_FROM(Sign, sign_index, var, start)
|
||||
#define FOR_ALL_SIGNS(var) FOR_ALL_SIGNS_FROM(var, 0)
|
||||
|
||||
#endif /* SIGNS_BASE_H */
|
||||
|
|
|
@ -60,8 +60,7 @@ struct SignList {
|
|||
|
||||
this->signs.clear();
|
||||
|
||||
const Sign *si;
|
||||
FOR_ALL_SIGNS(si) this->signs.push_back(si);
|
||||
for (const Sign *si : Sign::Iterate()) this->signs.push_back(si);
|
||||
|
||||
this->signs.SetFilterState(true);
|
||||
this->FilterSignList();
|
||||
|
|
|
@ -2260,8 +2260,7 @@ void RebuildViewportKdtree()
|
|||
if (town->cache.sign.kdtree_valid) items.push_back(ViewportSignKdtreeItem::MakeTown(town->index));
|
||||
}
|
||||
|
||||
const Sign *sign;
|
||||
FOR_ALL_SIGNS(sign) {
|
||||
for (const Sign *sign : Sign::Iterate()) {
|
||||
if (sign->sign.kdtree_valid) items.push_back(ViewportSignKdtreeItem::MakeSign(sign->index));
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue