dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow use of GetTownRoadType result in HasRoadTypeAvail for towns

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-03-06 01:07:16 +00:00
parent faa77e2605
commit b07d964081
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/road.cpp
View File

@@ -144,7 +144,13 @@ bool HasRoadTypeAvail(const CompanyID company, RoadType roadtype)
{ {
if (company == OWNER_DEITY || company == OWNER_TOWN || _game_mode == GM_EDITOR || _generating_world) { if (company == OWNER_DEITY || company == OWNER_TOWN || _game_mode == GM_EDITOR || _generating_world) {
const RoadTypeInfo *rti = GetRoadTypeInfo(roadtype); const RoadTypeInfo *rti = GetRoadTypeInfo(roadtype);
return rti->label != 0 && (rti->flags & ROTFB_HIDDEN) == 0; if (rti->label == 0) return false;
bool available = (rti->flags & ROTFB_HIDDEN) == 0;
if (!available && (company == OWNER_TOWN || _game_mode == GM_EDITOR || _generating_world)) {
if (roadtype == GetTownRoadType()) return true;
}
return available;
} else { } else {
const Company *c = Company::GetIfValid(company); const Company *c = Company::GetIfValid(company);
if (c == nullptr) return false; if (c == nullptr) return false;