dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r4200) -Codechange: Make use of water map accessors when getting the Index of a Ship Depot. TODO: Store the depot index in the map

Browse Source
This commit is contained in:
celestar
2006-03-31 10:47:06 +00:00
parent 6e97540f1e
commit 113b093d89
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
order_gui.c
View File

@@ -20,6 +20,7 @@
#include "depot.h" #include "depot.h"
#include "waypoint.h" #include "waypoint.h"
#include "train.h" #include "train.h"
#include "water_map.h"
static int OrderGetSel(const Window* w) static int OrderGetSel(const Window* w)
{ {
@@ -232,13 +233,11 @@ static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile)
if (v->type != VEH_Ship) break; if (v->type != VEH_Ship) break;
if (IsTileDepotType(tile, TRANSPORT_WATER) && if (IsTileDepotType(tile, TRANSPORT_WATER) &&
IsTileOwner(tile, _local_player)) { IsTileOwner(tile, _local_player)) {
switch (_m[tile].m5) { TileIndex tile2 = GetOtherShipDepotTile(tile);
case 0x81: tile -= TileDiffXY(1, 0); break;
case 0x83: tile -= TileDiffXY(0, 1); break;
}
order.type = OT_GOTO_DEPOT; order.type = OT_GOTO_DEPOT;
order.flags = OF_PART_OF_ORDERS; order.flags = OF_PART_OF_ORDERS;
order.station = GetDepotByTile(tile)->index; order.station = GetDepotByTile(tile < tile2 ? tile : tile2)->index;
return order; return order;
} }