summaryrefslogtreecommitdiff
path: root/src/saveload
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-07-24 11:47:12 +0000
committerrubidium <rubidium@openttd.org>2009-07-24 11:47:12 +0000
commitcf38a5bee6628f4be58a1bd7774658cf86807d5c (patch)
tree2c2890dd002ff6aee0e4fc1905796b623a040153 /src/saveload
parent2c6b5237f68b1ce444f35eef6e31e7c0ff49d7cc (diff)
downloadopenttd-cf38a5bee6628f4be58a1bd7774658cf86807d5c.tar.xz
(svn r16939) -Codechange: s/RailwayStation/RailStation/ to unify the way it's written.
Diffstat (limited to 'src/saveload')
-rw-r--r--src/saveload/afterload.cpp8
-rw-r--r--src/saveload/labelmaps_sl.cpp2
-rw-r--r--src/saveload/waypoint_sl.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index 3326bc53e..5f99ca61b 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -561,7 +561,7 @@ bool AfterLoadGame()
if (HasBit(_m[t].m6, 3)) SetBit(_m[t].m6, 2);
StationGfx gfx = GetStationGfx(t);
StationType st;
- if ( IsInsideMM(gfx, 0, 8)) { // Railway station
+ if ( IsInsideMM(gfx, 0, 8)) { // Rail station
st = STATION_RAIL;
SetStationGfx(t, gfx - 0);
} else if (IsInsideMM(gfx, 8, 67)) { // Airport
@@ -573,13 +573,13 @@ bool AfterLoadGame()
} else if (IsInsideMM(gfx, 71, 75)) { // Bus
st = STATION_BUS;
SetStationGfx(t, gfx - 71);
- } else if (gfx == 75) { // Oil rig
+ } else if (gfx == 75) { // Oil rig
st = STATION_OILRIG;
SetStationGfx(t, gfx - 75);
} else if (IsInsideMM(gfx, 76, 82)) { // Dock
st = STATION_DOCK;
SetStationGfx(t, gfx - 76);
- } else if (gfx == 82) { // Buoy
+ } else if (gfx == 82) { // Buoy
st = STATION_BUOY;
SetStationGfx(t, gfx - 82);
} else if (IsInsideMM(gfx, 83, 168)) { // Extended airport
@@ -1654,7 +1654,7 @@ bool AfterLoadGame()
break;
case MP_STATION: // Clear PBS reservation on station
- if (IsRailwayStation(t)) SetRailwayStationReservation(t, false);
+ if (HasStationRail(t)) SetRailStationReservation(t, false);
break;
case MP_TUNNELBRIDGE: // Clear PBS reservation on tunnels/birdges
diff --git a/src/saveload/labelmaps_sl.cpp b/src/saveload/labelmaps_sl.cpp
index f216b8333..274b735ff 100644
--- a/src/saveload/labelmaps_sl.cpp
+++ b/src/saveload/labelmaps_sl.cpp
@@ -64,7 +64,7 @@ void AfterLoadLabelMaps()
break;
case MP_STATION:
- if (IsRailwayStation(t)) {
+ if (HasStationRail(t)) {
SetRailType(t, railtype_conversion_map[GetRailType(t)]);
}
break;
diff --git a/src/saveload/waypoint_sl.cpp b/src/saveload/waypoint_sl.cpp
index 04cbfd577..728537258 100644
--- a/src/saveload/waypoint_sl.cpp
+++ b/src/saveload/waypoint_sl.cpp
@@ -104,7 +104,7 @@ void MoveWaypointsToBaseStations()
new_wp->facilities |= FACIL_TRAIN;
new_wp->owner = GetTileOwner(t);
- SetRailwayStationReservation(t, reserved);
+ SetRailStationReservation(t, reserved);
if (wp->spec != NULL) {
SetCustomStationSpecIndex(t, AllocateSpecToStation(wp->spec, new_wp, true));