mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r15551) -Fix [FS#2656]: [NoAI] crash when setting a depot order to the southern part of a ship depot

release/0.7
rubidium 2009-02-22 00:30:36 +00:00
parent b68a870fe3
commit 731c1e90e8
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/depot.cpp
View File

@ -7,6 +7,9 @@
#include "order_func.h" #include "order_func.h"
#include "window_func.h" #include "window_func.h"
#include "oldpool_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) DEFINE_OLD_POOL_GENERIC(Depot, Depot)
@ -17,6 +20,13 @@ DEFINE_OLD_POOL_GENERIC(Depot, Depot)
*/ */
Depot *GetDepotByTile(TileIndex tile) 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; Depot *depot;
FOR_ALL_DEPOTS(depot) { FOR_ALL_DEPOTS(depot) {