gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-11 18:10:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r11957) -Codechange [FS#1678]: Minor simplification and optimisation when checking for available road/rail types (bilbo)

Browse Source
This commit is contained in:
peter1138 2008-01-23 09:43:53 +00:00
parent 0f966a316a
commit e35cf20a23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/rail.cpp
View File

@ -167,11 +167,12 @@ RailTypes GetPlayerRailtypes(PlayerID p)
{ {
RailTypes rt = RAILTYPES_NONE; RailTypes rt = RAILTYPES_NONE;
for (EngineID i = 0; i != TOTAL_NUM_ENGINES; i++) { EngineID i;
FOR_ALL_ENGINEIDS_OF_TYPE(i, VEH_TRAIN) {
const Engine* e = GetEngine(i); const Engine* e = GetEngine(i);
const EngineInfo *ei = EngInfo(i); const EngineInfo *ei = EngInfo(i);
if (e->type == VEH_TRAIN && HasBit(ei->climates, _opt.landscape) && if (HasBit(ei->climates, _opt.landscape) &&
(HasBit(e->player_avail, p) || _date >= e->intro_date + 365)) { (HasBit(e->player_avail, p) || _date >= e->intro_date + 365)) {
const RailVehicleInfo *rvi = RailVehInfo(i); const RailVehicleInfo *rvi = RailVehInfo(i);

5
src/road.cpp
View File

@ -96,11 +96,12 @@ RoadTypes GetPlayerRoadtypes(PlayerID p)
{ {
RoadTypes rt = ROADTYPES_NONE; RoadTypes rt = ROADTYPES_NONE;
for (EngineID i = 0; i != TOTAL_NUM_ENGINES; i++) { EngineID i;
FOR_ALL_ENGINEIDS_OF_TYPE(i, VEH_ROAD) {
const Engine* e = GetEngine(i); const Engine* e = GetEngine(i);
const EngineInfo *ei = EngInfo(i); const EngineInfo *ei = EngInfo(i);
if (e->type == VEH_ROAD && HasBit(ei->climates, _opt.landscape) && if (HasBit(ei->climates, _opt.landscape) &&
(HasBit(e->player_avail, p) || _date >= e->intro_date + 365)) { (HasBit(e->player_avail, p) || _date >= e->intro_date + 365)) {
SetBit(rt, HasBit(ei->misc_flags, EF_ROAD_TRAM) ? ROADTYPE_TRAM : ROADTYPE_ROAD); SetBit(rt, HasBit(ei->misc_flags, EF_ROAD_TRAM) ? ROADTYPE_TRAM : ROADTYPE_ROAD);
} }