diff options
| author | matthijs <matthijs@openttd.org> | 2005-02-06 22:36:08 +0000 |
|---|---|---|
| committer | matthijs <matthijs@openttd.org> | 2005-02-06 22:36:08 +0000 |
| commit | cc0966405b3dc39a762e54ec0895ad3f346c53ab (patch) | |
| tree | b4e6f6fce72b1b3fcb2b25b635ad70c6bd5b6741 /ship_gui.c | |
| parent | 257e97c09a5445c339118c3269cd3bd39151c65c (diff) | |
| download | openttd-cc0966405b3dc39a762e54ec0895ad3f346c53ab.tar.xz | |
(svn r1834) - Fix: NPF does not check the owner of its target, busses try to enter other players' depots. TODO
- Add: asserts to find the v->u.rail.track == 0 problem.
- Add: IsValidDepot(), IsValidTown(), IsValidSign(), IsValidVehicle(), IsValidStation()
- Add: GetTileOwner(), IsTileOwner()
- Codechange: Replaced IsShipDepotTile(), IsTrainDepotTile(), IsRoadDepotTile() by IsTileDepotType().
- Codechange: typedeffed the MAP_OWNERS as Owner. Should be used as variable type.
- Codechange: Replaced a few uint by TileIndex.
Diffstat (limited to 'ship_gui.c')
| -rw-r--r-- | ship_gui.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ship_gui.c b/ship_gui.c index 2da8378f5..31d7081d9 100644 --- a/ship_gui.c +++ b/ship_gui.c @@ -491,7 +491,7 @@ static void ShipViewWndProc(Window *w, WindowEvent *e) { if (ShipVehInfo(v->engine_type)->refittable && v->vehstatus&VS_STOPPED && v->u.ship.state == 0x80 && - IsShipDepotTile(v->tile)) + IsTileDepotType(v->tile, TRANSPORT_WATER)) disabled = 0; if (v->owner != _local_player) @@ -979,7 +979,7 @@ static void PlayerShipsWndProc(Window *w, WindowEvent *e) DrawVehicleProfitButton(v, x, y + 13); SetDParam(0, v->unitnumber); - if (IsShipDepotTile(v->tile) && (v->vehstatus & VS_HIDDEN)) + if (IsTileDepotType(v->tile, TRANSPORT_WATER) && (v->vehstatus & VS_HIDDEN)) str = STR_021F; else str = v->age > v->max_age - 366 ? STR_00E3 : STR_00E2; @@ -1040,7 +1040,7 @@ static void PlayerShipsWndProc(Window *w, WindowEvent *e) tile = _last_built_ship_depot_tile; do { - if (_map_owner[tile] == _local_player && IsShipDepotTile(tile)) { + if (_map_owner[tile] == _local_player && IsTileDepotType(tile, TRANSPORT_WATER)) { ShowShipDepotWindow(tile); ShowBuildShipWindow(tile); return; |