From c2658c1105d20b5c7f68da7ee0ac0e7dcecaced7 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 22 Feb 2009 00:30:36 +0000 Subject: (svn r15551) -Fix [FS#2656]: [NoAI] crash when setting a depot order to the southern part of a ship depot --- src/depot.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/depot.cpp b/src/depot.cpp index e8b6b3e5c..e73490071 100644 --- a/src/depot.cpp +++ b/src/depot.cpp @@ -7,6 +7,9 @@ #include "order_func.h" #include "window_func.h" #include "oldpool_func.h" +#include "core/bitmath_func.hpp" +#include "tile_map.h" +#include "water_map.h" DEFINE_OLD_POOL_GENERIC(Depot, Depot) @@ -17,6 +20,13 @@ DEFINE_OLD_POOL_GENERIC(Depot, Depot) */ Depot *GetDepotByTile(TileIndex tile) { + /* A ship depot is multiple tiles. The north most tile is + * always the ->xy tile, so make sure we always look for + * the nothern tile and not the southern one. */ + if (IsShipDepotTile(tile)) { + tile = min(tile, GetOtherShipDepotTile(tile)); + } + Depot *depot; FOR_ALL_DEPOTS(depot) { -- cgit v1.2.3-70-g09d2