gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-06-22 21:19:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup: use switch for industry cargo vars

Browse Source
This commit is contained in:
Johannes E. Krause 2019-03-24 18:03:18 +01:00 committed by PeterN
parent 49f7332b75
commit 1a4c7a4e54
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/newgrf_industries.cpp
View File

@ -312,12 +312,14 @@ static uint32 GetCountAndDistanceOfClosestInstance(byte param_setID, byte layout
CargoID cargo = GetCargoTranslation(parameter, this->ro.grffile); CargoID cargo = GetCargoTranslation(parameter, this->ro.grffile);
int index = this->industry->GetCargoProducedIndex(cargo); int index = this->industry->GetCargoProducedIndex(cargo);
if (index < 0) return 0; // invalid cargo if (index < 0) return 0; // invalid cargo
if (variable == 0x69) return this->industry->produced_cargo_waiting[index]; switch (variable) {
if (variable == 0x6A) return this->industry->this_month_production[index]; case 0x69: return this->industry->produced_cargo_waiting[index];
if (variable == 0x6B) return this->industry->this_month_transported[index]; case 0x6A: return this->industry->this_month_production[index];
if (variable == 0x6C) return this->industry->last_month_production[index]; case 0x6B: return this->industry->this_month_transported[index];
if (variable == 0x6D) return this->industry->last_month_transported[index]; case 0x6C: return this->industry->last_month_production[index];
NOT_REACHED(); case 0x6D: return this->industry->last_month_transported[index];
default: NOT_REACHED();
}
} }