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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/order_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2023-03-05 12:41:58 +00:00
parent 2ea1766677 30ae07269d
commit cbd71b3d58
66 changed files with 150 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/road.cpp
View File

@@ -143,7 +143,15 @@ RoadBits CleanUpRoadBits(const TileIndex tile, RoadBits org_rb)
bool HasRoadTypeAvail(const CompanyID company, RoadType roadtype)
{
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 {
const Company *c = Company::GetIfValid(company);
if (c == nullptr) return false;