diff options
| author | Darkvater <darkvater@openttd.org> | 2005-02-22 19:38:44 +0000 |
|---|---|---|
| committer | Darkvater <darkvater@openttd.org> | 2005-02-22 19:38:44 +0000 |
| commit | 1f66d602725c26c3b378724e7c73ecb7493edd9b (patch) | |
| tree | 8e2c184beea8b06e07df7cc1875678f00f2515b1 /ship_cmd.c | |
| parent | 6805abe0f3976a6bbca32ce3d28bc44789a1802a (diff) | |
| download | openttd-1f66d602725c26c3b378724e7c73ecb7493edd9b.tar.xz | |
(svn r1905) - Fix: [ 1118810 ] openttd: ship_cmd.c:642 ... Assertion failed. Mapwrap fixed in ship_cmd.c (was implicitely ok before biggermaps).
- CodeChange: rename all vehicle controllers to ...Controller for their similar behaviour
Diffstat (limited to 'ship_cmd.c')
| -rw-r--r-- | ship_cmd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ship_cmd.c b/ship_cmd.c index 537059ffd..e5a186089 100644 --- a/ship_cmd.c +++ b/ship_cmd.c @@ -691,7 +691,6 @@ static const byte _ship_subcoord[4][6][3] = { } }; - static void ShipController(Vehicle *v) { GetNewVehiclePosResult gp; @@ -779,7 +778,7 @@ static void ShipController(Vehicle *v) } } else { // new tile - if (TileX(gp.new_tile) == MapMaxX() || TileY(gp.new_tile) == MapMaxY()) + if (TileX(gp.new_tile) >= MapMaxX() || TileY(gp.new_tile) >= MapMaxY()) goto reverse_direction; dir = ShipGetNewDirectionFromTiles(gp.new_tile, gp.old_tile); |