(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
This commit is contained in:
Darkvater
2005-02-22 19:38:44 +00:00
parent df46c50d1c
commit cd369308aa
3 changed files with 7 additions and 10 deletions

View File

@@ -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);