mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-20 19:02:41 +01:00
Code Issues Releases Wiki Activity

Codechange: Use enum class for RoadTileType.

Browse Source
This commit is contained in:
Peter Nelson
2025-11-17 19:49:36 +00:00
committed by Peter Nelson
parent 2851c70a59
commit 2cd5a241c5
8 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/script/api/script_order.cpp
View File

@@ -40,7 +40,7 @@ static OrderType GetOrderTypeByTile(TileIndex t)
return OT_GOTO_STATION;
case MP_WATER: if (::IsShipDepot(t)) return OT_GOTO_DEPOT; break;
case MP_ROAD: if (::GetRoadTileType(t) == ROAD_TILE_DEPOT) return OT_GOTO_DEPOT; break;
case MP_ROAD: if (::GetRoadTileType(t) == RoadTileType::Depot) return OT_GOTO_DEPOT; break;
case MP_RAILWAY:
if (IsRailDepot(t)) return OT_GOTO_DEPOT;
break;

8
src/script/api/script_road.cpp
View File

@@ -37,7 +37,7 @@
{
if (!::IsValidTile(tile)) return false;
return (::IsTileType(tile, MP_ROAD) && ::GetRoadTileType(tile) != ROAD_TILE_DEPOT) ||
return (::IsTileType(tile, MP_ROAD) && ::GetRoadTileType(tile) != RoadTileType::Depot) ||
IsDriveThroughRoadStationTile(tile);
}
@@ -46,7 +46,7 @@
if (!::IsValidTile(tile)) return false;
if (!IsRoadTypeAvailable(GetCurrentRoadType())) return false;
return ::IsTileType(tile, MP_ROAD) && ::GetRoadTileType(tile) == ROAD_TILE_DEPOT &&
return ::IsTileType(tile, MP_ROAD) && ::GetRoadTileType(tile) == RoadTileType::Depot &&
::GetPresentRoadTypes(tile).Test(::RoadType(GetCurrentRoadType()));
}
@@ -465,7 +465,7 @@ static bool NeighbourHasReachableRoad(::RoadType rt, TileIndex start_tile, DiagD
switch (::GetTileType(neighbour_tile)) {
case MP_ROAD:
return (::GetRoadTileType(neighbour_tile) != ROAD_TILE_DEPOT);
return (::GetRoadTileType(neighbour_tile) != RoadTileType::Depot);
case MP_STATION:
if (::IsDriveThroughStopTile(neighbour_tile)) {
@@ -623,7 +623,7 @@ static bool NeighbourHasReachableRoad(::RoadType rt, TileIndex start_tile, DiagD
EnforceCompanyModeValid(false);
EnforcePrecondition(false, ::IsValidTile(tile));
EnforcePrecondition(false, IsTileType(tile, MP_ROAD))
EnforcePrecondition(false, GetRoadTileType(tile) == ROAD_TILE_DEPOT);
EnforcePrecondition(false, GetRoadTileType(tile) == RoadTileType::Depot);
return ScriptObject::Command<CMD_LANDSCAPE_CLEAR>::Do(tile);
}

2
src/script/api/script_tile.cpp
View File

@@ -37,7 +37,7 @@
/* Tram bits aren't considered buildable */
if (::GetRoadTypeTram(tile) != INVALID_ROADTYPE) return false;
/* Depots and crossings aren't considered buildable */
if (::GetRoadTileType(tile) != ROAD_TILE_NORMAL) return false;
if (::GetRoadTileType(tile) != RoadTileType::Normal) return false;
if (!HasExactlyOneBit(::GetRoadBits(tile, RTT_ROAD))) return false;
if (::IsRoadOwner(tile, RTT_ROAD, OWNER_TOWN)) return true;
if (::IsRoadOwner(tile, RTT_ROAD, ScriptObject::GetCompany())) return true;