diff options
| author | rubidium <rubidium@openttd.org> | 2008-09-30 20:39:50 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-09-30 20:39:50 +0000 |
| commit | 3b798599b63067c2e92aa49906ea66a07ae8de44 (patch) | |
| tree | 69fb7ae1d9bdadb9e7386cb70b0a26621ad9b57f /src/yapf | |
| parent | cc1e761edab14f8264dba44d09f7272d931bdd93 (diff) | |
| download | openttd-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/yapf')
| -rw-r--r-- | src/yapf/follow_track.hpp | 2 | ||||
| -rw-r--r-- | src/yapf/yapf_base.hpp | 2 | ||||
| -rw-r--r-- | src/yapf/yapf_destrail.hpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/yapf/follow_track.hpp b/src/yapf/follow_track.hpp index 16d405eea..e990424b6 100644 --- a/src/yapf/follow_track.hpp +++ b/src/yapf/follow_track.hpp @@ -288,7 +288,7 @@ protected: m_err = EC_NO_WAY; return false; } - // don't try to enter other player's depots + // don't try to enter other company's depots if (GetTileOwner(m_new_tile) != m_veh_owner) { m_err = EC_OWNER; return false; diff --git a/src/yapf/yapf_base.hpp b/src/yapf/yapf_base.hpp index f09a97d61..418a36d9f 100644 --- a/src/yapf/yapf_base.hpp +++ b/src/yapf/yapf_base.hpp @@ -91,7 +91,7 @@ protected: FORCEINLINE Tpf& Yapf() {return *static_cast<Tpf*>(this);} public: - /// return current settings (can be custom - player based - but later) + /// return current settings (can be custom - company based - but later) FORCEINLINE const YAPFSettings& PfGetSettings() const { return *m_settings; diff --git a/src/yapf/yapf_destrail.hpp b/src/yapf/yapf_destrail.hpp index a048ebfd4..da5d82a5c 100644 --- a/src/yapf/yapf_destrail.hpp +++ b/src/yapf/yapf_destrail.hpp @@ -139,13 +139,13 @@ public: Waypoint *wp = GetWaypoint(v->current_order.GetDestination()); if (wp == NULL) { /* Invalid waypoint in orders! */ - DEBUG(yapf, 0, "Invalid waypoint in orders == 0x%04X (train %d, player %d)", v->current_order.GetDestination(), v->unitnumber, (PlayerID)v->owner); + DEBUG(yapf, 0, "Invalid waypoint in orders == 0x%04X (train %d, company %d)", v->current_order.GetDestination(), v->unitnumber, (CompanyID)v->owner); break; } m_destTile = wp->xy; if (m_destTile != v->dest_tile) { /* Something is wrong with orders! */ - DEBUG(yapf, 0, "Invalid v->dest_tile == 0x%04X (train %d, player %d)", v->dest_tile, v->unitnumber, (PlayerID)v->owner); + DEBUG(yapf, 0, "Invalid v->dest_tile == 0x%04X (train %d, company %d)", v->dest_tile, v->unitnumber, (CompanyID)v->owner); } m_dest_station_id = INVALID_STATION; m_destTrackdirs = TrackToTrackdirBits(AxisToTrack(GetWaypointAxis(wp->xy))); |