diff options
| author | peter1138 <peter1138@openttd.org> | 2019-04-06 07:46:15 +0100 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2019-05-01 21:36:27 +0200 |
| commit | c02ef3e4564b7b54d49f0827d2d7625cbc38f335 (patch) | |
| tree | 1c0ee62b6ce55124b247daaafa42300bfaa932e7 /src/bridge_map.h | |
| parent | 21edf67f89c60351d5a0d84625455aa296b6b950 (diff) | |
| download | openttd-c02ef3e4564b7b54d49f0827d2d7625cbc38f335.tar.xz | |
Feature: Add NotRoadTypes (NRT)
Diffstat (limited to 'src/bridge_map.h')
| -rw-r--r-- | src/bridge_map.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/bridge_map.h b/src/bridge_map.h index 4e70238c2..1461df13a 100644 --- a/src/bridge_map.h +++ b/src/bridge_map.h @@ -132,11 +132,11 @@ static inline void MakeBridgeRamp(TileIndex t, Owner o, BridgeType bridgetype, D SetTileOwner(t, o); _m[t].m2 = 0; _m[t].m3 = 0; - _m[t].m4 = 0; + _m[t].m4 = INVALID_ROADTYPE; _m[t].m5 = 1 << 7 | tt << 2 | d; SB(_me[t].m6, 2, 4, bridgetype); _me[t].m7 = 0; - _me[t].m8 = 0; + _me[t].m8 = INVALID_ROADTYPE << 6; } /** @@ -147,14 +147,15 @@ static inline void MakeBridgeRamp(TileIndex t, Owner o, BridgeType bridgetype, D * @param owner_tram the new owner of the tram on the bridge * @param bridgetype the type of bridge this bridge ramp belongs to * @param d the direction this ramp must be facing - * @param rts the road types of the bridge + * @param road_rt the road type of the bridge + * @param tram_rt the tram type of the bridge */ -static inline void MakeRoadBridgeRamp(TileIndex t, Owner o, Owner owner_road, Owner owner_tram, BridgeType bridgetype, DiagDirection d, RoadTypes rts) +static inline void MakeRoadBridgeRamp(TileIndex t, Owner o, Owner owner_road, Owner owner_tram, BridgeType bridgetype, DiagDirection d, RoadType road_rt, RoadType tram_rt) { MakeBridgeRamp(t, o, bridgetype, d, TRANSPORT_ROAD); - SetRoadOwner(t, ROADTYPE_ROAD, owner_road); - if (owner_tram != OWNER_TOWN) SetRoadOwner(t, ROADTYPE_TRAM, owner_tram); - SetRoadTypes(t, rts); + SetRoadOwner(t, RTT_ROAD, owner_road); + if (owner_tram != OWNER_TOWN) SetRoadOwner(t, RTT_TRAM, owner_tram); + SetRoadTypes(t, road_rt, tram_rt); } /** |