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

Codechange: Replace FOR_ALL_ENGINE_RENEWS with range-based for loops

pull/7871/head
glx 2019-12-15 17:10:46 +01:00 committed by Niels Martin Hansen
parent ddabfed1cd
commit 60e3cf8aff
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/autoreplace_base.h
View File

@ -41,7 +41,4 @@ struct EngineRenew : EngineRenewPool::PoolItem<&_enginerenew_pool> {
~EngineRenew() {} ~EngineRenew() {}
}; };
#define FOR_ALL_ENGINE_RENEWS_FROM(var, start) FOR_ALL_ITEMS_FROM(EngineRenew, enginerenew_index, var, start)
#define FOR_ALL_ENGINE_RENEWS(var) FOR_ALL_ENGINE_RENEWS_FROM(var, 0)
#endif /* AUTOREPLACE_BASE_H */ #endif /* AUTOREPLACE_BASE_H */

3
src/group_cmd.cpp
View File

@ -384,10 +384,9 @@ CommandCost CmdDeleteGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
/* If we set an autoreplace for the group we delete, remove it. */ /* If we set an autoreplace for the group we delete, remove it. */
if (_current_company < MAX_COMPANIES) { if (_current_company < MAX_COMPANIES) {
Company *c; Company *c;
EngineRenew *er;
c = Company::Get(_current_company); c = Company::Get(_current_company);
FOR_ALL_ENGINE_RENEWS(er) { for (EngineRenew *er : EngineRenew::Iterate()) {
if (er->group_id == g->index) RemoveEngineReplacementForCompany(c, er->from, g->index, flags); if (er->group_id == g->index) RemoveEngineReplacementForCompany(c, er->from, g->index, flags);
} }
} }

8
src/saveload/autoreplace_sl.cpp
View File

@ -26,9 +26,7 @@ static const SaveLoad _engine_renew_desc[] = {
static void Save_ERNW() static void Save_ERNW()
{ {
EngineRenew *er; for (EngineRenew *er : EngineRenew::Iterate()) {
FOR_ALL_ENGINE_RENEWS(er) {
SlSetArrayIndex(er->index); SlSetArrayIndex(er->index);
SlObject(er, _engine_renew_desc); SlObject(er, _engine_renew_desc);
} }
@ -53,9 +51,7 @@ static void Load_ERNW()
static void Ptrs_ERNW() static void Ptrs_ERNW()
{ {
EngineRenew *er; for (EngineRenew *er : EngineRenew::Iterate()) {
FOR_ALL_ENGINE_RENEWS(er) {
SlObject(er, _engine_renew_desc); SlObject(er, _engine_renew_desc);
} }
} }