summaryrefslogtreecommitdiff
path: root/src/waypoint.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-09-30 20:39:50 +0000
committerrubidium <rubidium@openttd.org>2008-09-30 20:39:50 +0000
commit3b798599b63067c2e92aa49906ea66a07ae8de44 (patch)
tree69fb7ae1d9bdadb9e7386cb70b0a26621ad9b57f /src/waypoint.cpp
parentcc1e761edab14f8264dba44d09f7272d931bdd93 (diff)
downloadopenttd-3b798599b63067c2e92aa49906ea66a07ae8de44.tar.xz
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
Diffstat (limited to 'src/waypoint.cpp')
-rw-r--r--src/waypoint.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/waypoint.cpp b/src/waypoint.cpp
index f455dde5f..ecf8bbb6e 100644
--- a/src/waypoint.cpp
+++ b/src/waypoint.cpp
@@ -144,7 +144,7 @@ static Waypoint *FindDeletedWaypointCloseTo(TileIndex tile)
uint thres = 8;
FOR_ALL_WAYPOINTS(wp) {
- if (wp->deleted && (wp->owner == OWNER_NONE || wp->owner == _current_player)) {
+ if (wp->deleted && (wp->owner == OWNER_NONE || wp->owner == _current_company)) {
uint cur_dist = DistanceManhattan(tile, wp->xy);
if (cur_dist < thres) {
@@ -310,7 +310,7 @@ CommandCost RemoveTrainWaypoint(TileIndex tile, uint32 flags, bool justremove)
/* Make sure it's a waypoint */
if (!IsRailWaypointTile(tile) ||
- (!CheckTileOwnership(tile) && _current_player != OWNER_WATER) ||
+ (!CheckTileOwnership(tile) && _current_company != OWNER_WATER) ||
!EnsureNoVehicleOnGround(tile)) {
return CMD_ERROR;
}