Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-10-31 15:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: game scripts must not build with non-existing road types

Browse Source
This commit is contained in:
Rubidium 2023-03-04 20:56:17 +01:00 committed by rubidium42
parent 01ebfad809
commit 30ae07269d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/road.cpp
View File

@ -111,7 +111,15 @@ RoadBits CleanUpRoadBits(const TileIndex tile, RoadBits org_rb)
bool HasRoadTypeAvail(const CompanyID company, RoadType roadtype) 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) {
return true; // TODO: should there be a proper check? const RoadTypeInfo *rti = GetRoadTypeInfo(roadtype);
if (rti->label == 0) return false;
/*
* Do not allow building hidden road types, except when a town may build it.
* The GS under deity mode, as well as anybody in the editor builds roads that are
* owned by towns. So if a town may build it, it should be buildable by them too.
*/
return (rti->flags & ROTFB_HIDDEN) == 0 || (rti->flags & ROTFB_TOWN_BUILD) != 0;
} else { } else {
const Company *c = Company::GetIfValid(company); const Company *c = Company::GetIfValid(company);
if (c == nullptr) return false; if (c == nullptr) return false;