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

(svn r26692) -Fix [FS#6059]: Ordering a vehicle to a competitor's rail waypoint displayed an error message. Ignore the click as is done for the other order types to competitor's stuff. (Juanjo)

release/1.5
frosch 2014-07-16 20:56:39 +00:00
parent 925fb7bd37
commit 14c4b24405
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/depot_map.h
View File

@ -29,6 +29,9 @@ static inline bool IsDepotTypeTile(TileIndex tile, TransportType type)
case TRANSPORT_WATER: case TRANSPORT_WATER:
return IsShipDepotTile(tile); return IsShipDepotTile(tile);
case TRANSPORT_AIR:
return IsHangarTile(tile);
} }
} }
@ -58,7 +61,7 @@ static inline DepotID GetDepotIndex(TileIndex t)
/** /**
* Get the type of vehicles that can use a depot * Get the type of vehicles that can use a depot
* @param t The tile * @param t The tile
* @pre IsRailDepotTile(t) || IsRoadDepotTile(t) || IsShipDepotTile(t) || IsTileType(t, MP_STATION) * @pre IsDepotTile(t)
* @return the type of vehicles that can use the depot * @return the type of vehicles that can use the depot
*/ */
static inline VehicleType GetDepotVehicleType(TileIndex t) static inline VehicleType GetDepotVehicleType(TileIndex t)

3
src/order_gui.cpp
View File

@ -410,7 +410,8 @@ static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile)
return order; return order;
} }
if ((IsBuoyTile(tile) && v->type == VEH_SHIP) || (IsRailWaypointTile(tile) && v->type == VEH_TRAIN)) { /* check buoy (no ownership) */
if (IsBuoyTile(tile) && v->type == VEH_SHIP) {
order.MakeGoToWaypoint(GetStationIndex(tile)); order.MakeGoToWaypoint(GetStationIndex(tile));
return order; return order;
} }