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

Allow changing road vehicle driving side when all road vehicles in depots

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-09-11 11:51:32 +01:00
parent a8d5e56696
commit 143230d8f2
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/road_cmd.cpp
View File

@@ -180,14 +180,26 @@ RoadType AllocateRoadType(RoadTypeLabel label, RoadTramType rtt)
} }
/** /**
* Verify whether a road vehicle is available. * Verify whether a road vehicle has been built.
* @return \c true if at least one road vehicle is available, \c false if not * @return \c true if at least one road vehicle has been built, \c false if not
*/ */
bool RoadVehiclesAreBuilt() bool RoadVehiclesAreBuilt()
{ {
return !RoadVehicle::Iterate().empty(); return !RoadVehicle::Iterate().empty();
} }
/**
* Verify whether a road vehicle has been built and is not in a depot.
* @return \c true if at least one road vehicle has been built and is not in a depot, \c false if not
*/
bool RoadVehiclesExistOutsideDepots()
{
for (const RoadVehicle *rv : RoadVehicle::Iterate()) {
if (rv->IsFrontEngine() && !rv->IsChainInDepot()) return true;
}
return false;
}
static DisallowedRoadDirections GetOneWayRoadTileDisallowedRoadDirections(TileIndex tile) static DisallowedRoadDirections GetOneWayRoadTileDisallowedRoadDirections(TileIndex tile)
{ {
if (IsNormalRoadTile(tile)) return GetDisallowedRoadDirections(tile); if (IsNormalRoadTile(tile)) return GetDisallowedRoadDirections(tile);

4
src/settings.cpp
View File

@@ -1483,8 +1483,8 @@ static void MaxNoAIsChange(int32 new_value)
*/ */
static bool CheckRoadSide(int32 &new_value) static bool CheckRoadSide(int32 &new_value)
{ {
extern bool RoadVehiclesAreBuilt(); extern bool RoadVehiclesExistOutsideDepots();
return (_game_mode == GM_MENU || !RoadVehiclesAreBuilt()); return (_game_mode == GM_MENU || !RoadVehiclesExistOutsideDepots());
} }
static void RoadSideChanged(int32 new_value) static void RoadSideChanged(int32 new_value)