amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-24 12:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: Make TileType enum an enum class.

Browse Source
This commit is contained in:
Cyprian Klimaszewski
2026-01-24 08:34:05 +01:00
committed by rubidium42
parent 7d34e09f94
commit 97f3e5b70f
94 changed files with 988 additions and 982 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/road_map.cpp
+6 -6
View File
@@ -21,13 +21,13 @@
bool MayHaveRoad(Tile t)
{
switch (GetTileType(t)) {
case MP_ROAD:
case TileType::Road:
return true;
case MP_STATION:
case TileType::Station:
return IsAnyRoadStop(t);
case MP_TUNNELBRIDGE:
case TileType::TunnelBridge:
return GetTunnelBridgeTransportType(t) == TRANSPORT_ROAD;
default:
@@ -56,7 +56,7 @@ RoadBits GetAnyRoadBits(Tile tile, RoadTramType rtt, bool straight_tunnel_bridge
if (!MayHaveRoad(tile) || !HasTileRoadType(tile, rtt)) return ROAD_NONE;
switch (GetTileType(tile)) {
case MP_ROAD:
case TileType::Road:
switch (GetRoadTileType(tile)) {
default:
case RoadTileType::Normal: return GetRoadBits(tile, rtt);
@@ -64,12 +64,12 @@ RoadBits GetAnyRoadBits(Tile tile, RoadTramType rtt, bool straight_tunnel_bridge
case RoadTileType::Depot: return DiagDirToRoadBits(GetRoadDepotDirection(tile));
}
case MP_STATION:
case TileType::Station:
assert(IsAnyRoadStopTile(tile)); // ensured by MayHaveRoad
if (IsDriveThroughStopTile(tile)) return AxisToRoadBits(GetDriveThroughStopAxis(tile));
return DiagDirToRoadBits(GetBayRoadStopDir(tile));
case MP_TUNNELBRIDGE:
case TileType::TunnelBridge:
assert(GetTunnelBridgeTransportType(tile) == TRANSPORT_ROAD); // ensured by MayHaveRoad
return straight_tunnel_bridge_entrance ?
AxisToRoadBits(DiagDirToAxis(GetTunnelBridgeDirection(tile))) :