gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-10 08:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r8966) -Codechange: replace some if-cascades by switches.

Browse Source
This commit is contained in:
rubidium 2007-03-02 00:17:35 +00:00
parent cd8090f3bd
commit 08973ba8eb
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/rail_cmd.cpp
View File

@ -1845,16 +1845,21 @@ set_ground:
static uint32 GetTileTrackStatus_Track(TileIndex tile, TransportType mode) static uint32 GetTileTrackStatus_Track(TileIndex tile, TransportType mode)
{ {
if (mode != TRANSPORT_RAIL) return 0;
switch (GetRailTileType(tile)) {
default: NOT_REACHED();
case RAIL_TILE_NORMAL: {
TrackBits rails = GetTrackBits(tile);
uint32 ret = rails * 0x101;
return (rails == TRACK_BIT_CROSS) ? ret | 0x40 : ret;
}
case RAIL_TILE_SIGNALS: {
uint32 ret = GetTrackBits(tile) * 0x101;
byte a; byte a;
uint16 b; uint16 b;
if (mode != TRANSPORT_RAIL) return 0;
if (IsPlainRailTile(tile)) {
TrackBits rails = GetTrackBits(tile);
uint32 ret = rails * 0x101;
if (HasSignals(tile)) {
a = _m[tile].m3; a = _m[tile].m3;
b = _m[tile].m2; b = _m[tile].m2;
@ -1871,25 +1876,21 @@ static uint32 GetTileTrackStatus_Track(TileIndex tile, TransportType mode)
if ((b & 0x40) == 0) ret |= 0x07100000; if ((b & 0x40) == 0) ret |= 0x07100000;
if ((b & 0x20) == 0) ret |= 0x20080000; if ((b & 0x20) == 0) ret |= 0x20080000;
if ((b & 0x10) == 0) ret |= 0x08200000; if ((b & 0x10) == 0) ret |= 0x08200000;
} else {
if (rails == TRACK_BIT_CROSS) ret |= 0x40;
}
return ret; return ret;
} else {
if (IsRailDepot(tile)) {
return AxisToTrackBits(DiagDirToAxis(GetRailDepotDirection(tile))) * 0x101;
} else {
return GetRailWaypointBits(tile) * 0x101;
} }
case RAIL_TILE_DEPOT: return AxisToTrackBits(DiagDirToAxis(GetRailDepotDirection(tile))) * 0x101;
case RAIL_TILE_WAYPOINT: return GetRailWaypointBits(tile) * 0x101;
} }
} }
static void ClickTile_Track(TileIndex tile) static void ClickTile_Track(TileIndex tile)
{ {
if (IsTileDepotType(tile, TRANSPORT_RAIL)) { switch (GetRailTileType(tile)) {
ShowDepotWindow(tile, VEH_Train); case RAIL_TILE_DEPOT: ShowDepotWindow(tile, VEH_Train); break;
} else if (IsRailWaypoint(tile)) { case RAIL_TILE_WAYPOINT: ShowRenameWaypointWindow(GetWaypointByTile(tile)); break;
ShowRenameWaypointWindow(GetWaypointByTile(tile)); default: break;
} }
} }