diff options
Diffstat (limited to 'src/road.cpp')
| -rw-r--r-- | src/road.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/road.cpp b/src/road.cpp index af6b5cbd1..add184f69 100644 --- a/src/road.cpp +++ b/src/road.cpp @@ -77,25 +77,25 @@ RoadBits CleanUpRoadBits(const TileIndex tile, RoadBits org_rb) return org_rb; } -bool HasRoadTypesAvail(const PlayerID p, const RoadTypes rts) +bool HasRoadTypesAvail(const CompanyID company, const RoadTypes rts) { RoadTypes avail_roadtypes; - if (p == OWNER_TOWN || _game_mode == GM_EDITOR || IsGeneratingWorld()) { + if (company == OWNER_TOWN || _game_mode == GM_EDITOR || IsGeneratingWorld()) { avail_roadtypes = ROADTYPES_ROAD; } else { - if (!IsValidPlayerID(p)) return false; - avail_roadtypes = (RoadTypes)GetPlayer(p)->avail_roadtypes | ROADTYPES_ROAD; // road is available for always for everybody + if (!IsValidCompanyID(company)) return false; + avail_roadtypes = (RoadTypes)GetCompany(company)->avail_roadtypes | ROADTYPES_ROAD; // road is available for always for everybody } return (rts & ~avail_roadtypes) == 0; } bool ValParamRoadType(const RoadType rt) { - return HasRoadTypesAvail(_current_player, RoadTypeToRoadTypes(rt)); + return HasRoadTypesAvail(_current_company, RoadTypeToRoadTypes(rt)); } -RoadTypes GetPlayerRoadtypes(PlayerID p) +RoadTypes GetCompanyRoadtypes(CompanyID company) { RoadTypes rt = ROADTYPES_NONE; @@ -104,7 +104,7 @@ RoadTypes GetPlayerRoadtypes(PlayerID p) const EngineInfo *ei = &e->info; if (HasBit(ei->climates, _settings_game.game_creation.landscape) && - (HasBit(e->player_avail, p) || _date >= e->intro_date + 365)) { + (HasBit(e->company_avail, company) || _date >= e->intro_date + 365)) { SetBit(rt, HasBit(ei->misc_flags, EF_ROAD_TRAM) ? ROADTYPE_TRAM : ROADTYPE_ROAD); } } |