diff options
| author | rubidium <rubidium@openttd.org> | 2009-07-21 22:37:10 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-07-21 22:37:10 +0000 |
| commit | 8405d7d7e762546e3e78d1e0c16bb226c36266fa (patch) | |
| tree | 11d3829fce669b25be64f203da5d93319a0c3cdc /src/station_cmd.cpp | |
| parent | 8083d67780d6a85c558080ec99dd2d24ae755d0f (diff) | |
| download | openttd-8405d7d7e762546e3e78d1e0c16bb226c36266fa.tar.xz | |
(svn r16907) -Codechange: make a more clear distinction between reservation functions that return a bool and that return TrackBits; GetRailStationReservation vs GetRailwayStationReservation, which one returns the bool and which one the TrackBits?
Diffstat (limited to 'src/station_cmd.cpp')
| -rw-r--r-- | src/station_cmd.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index dfcdfc85f..d0d4c2b4d 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -1019,7 +1019,7 @@ CommandCost CmdBuildRailroadStation(TileIndex tile_org, DoCommandFlag flags, uin int w = plat_len; do { byte layout = *layout_ptr++; - if (IsRailwayStationTile(tile) && GetRailwayStationReservation(tile)) { + if (IsRailwayStationTile(tile) && HasStationReservation(tile)) { /* Check for trains having a reservation for this tile. */ Train *v = GetTrainForReservation(tile, AxisToTrack(GetRailStationAxis(tile))); if (v != NULL) { @@ -1201,7 +1201,7 @@ CommandCost CmdRemoveFromRailroadStation(TileIndex tile, DoCommandFlag flags, ui Owner owner = GetTileOwner(tile2); Train *v = NULL; - if (GetRailwayStationReservation(tile2)) { + if (HasStationReservation(tile2)) { v = GetTrainForReservation(tile2, track); if (v != NULL) { /* Free train reservation. */ @@ -1301,7 +1301,7 @@ static CommandCost RemoveRailroadStation(TileIndex tile, DoCommandFlag flags) Track track = GetRailStationTrack(tile); Owner owner = GetTileOwner(tile); // _current_company can be OWNER_WATER Train *v = NULL; - if (GetRailwayStationReservation(tile)) { + if (HasStationReservation(tile)) { v = GetTrainForReservation(tile, track); if (v != NULL) FreeTrainTrackReservation(v); } @@ -2304,7 +2304,7 @@ static void DrawTile_Station(TileInfo *ti) DrawGroundSprite(image, GroundSpritePaletteTransform(image, pal, palette)); /* PBS debugging, draw reserved tracks darker */ - if (_game_mode != GM_MENU && _settings_client.gui.show_track_reservation && IsRailwayStation(ti->tile) && GetRailwayStationReservation(ti->tile)) { + if (_game_mode != GM_MENU && _settings_client.gui.show_track_reservation && IsRailwayStation(ti->tile) && HasStationReservation(ti->tile)) { const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(ti->tile)); DrawGroundSprite(GetRailStationAxis(ti->tile) == AXIS_X ? rti->base_sprites.single_y : rti->base_sprites.single_x, PALETTE_CRASH); } |