diff options
| author | tron <tron@openttd.org> | 2006-02-23 12:24:19 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2006-02-23 12:24:19 +0000 |
| commit | 6a74cb27870168271f6b249badcefbeb1da3af8c (patch) | |
| tree | f5ac06f102968f6cf3cbe40e0fca7d7a55514d1b /rail_cmd.c | |
| parent | c3c0afb902e5790a1b6c141d340e52d98f11316b (diff) | |
| download | openttd-6a74cb27870168271f6b249badcefbeb1da3af8c.tar.xz | |
(svn r3660) Convert further road bits and type references to the functions/enums
Diffstat (limited to 'rail_cmd.c')
| -rw-r--r-- | rail_cmd.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/rail_cmd.c b/rail_cmd.c index e166c2290..da7dcf157 100644 --- a/rail_cmd.c +++ b/rail_cmd.c @@ -403,7 +403,6 @@ int32 CmdRemoveSingleRail(int x, int y, uint32 flags, uint32 p1, uint32 p2) Track track = (Track)p2; TrackBits trackbit; TileIndex tile; - byte m5; int32 cost = _price.remove_rail; if (!ValParamTrackOrientation(p2)) return CMD_ERROR; @@ -442,27 +441,30 @@ int32 CmdRemoveSingleRail(int x, int y, uint32 flags, uint32 p1, uint32 p2) _m[tile].m5 = _m[tile].m5 & 0xC7; break; - case MP_STREET: + case MP_STREET: { + RoadBits bits; + if (!IsLevelCrossing(tile)) return CMD_ERROR; /* This is a crossing, let's check if the direction is correct */ if (_m[tile].m5 & 8) { - m5 = 5; if (track != TRACK_DIAG1) return CMD_ERROR; + bits = ROAD_Y; } else { - m5 = 10; if (track != TRACK_DIAG2) return CMD_ERROR; + bits = ROAD_X; } if (!(flags & DC_EXEC)) return _price.remove_rail; - _m[tile].m5 = m5; SetTileOwner(tile, _m[tile].m3); _m[tile].m2 = 0; + _m[tile].m5 = (ROAD_NORMAL << 4) | bits; break; + } case MP_RAILWAY: if (!IsPlainRailTile(tile)) |