diff options
| author | darkvater <darkvater@openttd.org> | 2004-11-14 13:07:07 +0000 |
|---|---|---|
| committer | darkvater <darkvater@openttd.org> | 2004-11-14 13:07:07 +0000 |
| commit | 397cc50f61768c73dd4a1ddea03fd5e763d85b50 (patch) | |
| tree | 19e28ad2c07c2774c4b799f431c2acffe63d655a /order_gui.c | |
| parent | 8946e92468db588a1a0d39da2b9a53523e091d10 (diff) | |
| download | openttd-397cc50f61768c73dd4a1ddea03fd5e763d85b50.tar.xz | |
(svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky).
Diffstat (limited to 'order_gui.c')
| -rw-r--r-- | order_gui.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/order_gui.c b/order_gui.c index 4df0fdd1f..68b19e7bd 100644 --- a/order_gui.c +++ b/order_gui.c @@ -111,9 +111,9 @@ static void DrawOrdersWindow(Window *w) if (v->type == VEH_Train) s += (ord>>6)&2; SET_DPARAM16(1, s + ((ord>>6)&1) ); - } else if ((ord & OT_MASK) == OT_GOTO_CHECKPOINT) { + } else if ((ord & OT_MASK) == OT_GOTO_WAYPOINT) { SET_DPARAM16(2, ord >> 8); - SET_DPARAM16(1, STR_GO_TO_CHECKPOINT); + SET_DPARAM16(1, STR_GO_TO_WAYPOINT); } } { @@ -195,12 +195,12 @@ static uint GetOrderCmdFromTile(Vehicle *v, uint tile) } } - // check checkpoint + // check waypoint if (IS_TILETYPE(tile, MP_RAILWAY) && v->type == VEH_Train && _map_owner[tile] == _local_player && (_map5[tile]&0xFE)==0xC4) - return (GetCheckpointByTile(tile)<<8) | OT_GOTO_CHECKPOINT; + return (GetWaypointByTile(tile)<<8) | OT_GOTO_WAYPOINT; if (IS_TILETYPE(tile, MP_STATION)) { st = DEREF_STATION(st_index = _map2[tile]); @@ -296,8 +296,8 @@ static void OrdersWndProc(Window *w, WindowEvent *e) case OT_GOTO_DEPOT: /* goto depot order */ xy = _depots[ord >> 8].xy; break; - case OT_GOTO_CHECKPOINT: /* goto checkpoint order */ - xy = _checkpoints[ord >> 8].xy; + case OT_GOTO_WAYPOINT: /* goto waypoint order */ + xy = _waypoints[ord >> 8].xy; } if (xy) |