cpp/openttd-patchpack/source Changeset - r21568:382ce1dc7e0f

Changeset - r21568:382ce1dc7e0f

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

frosch - 10 years ago 2014-07-16 20:56:39
frosch@openttd.org

(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)

2 files changed with 6 insertions and 2 deletions:

src/depot_map.h

src/order_gui.cpp

0 comments (0 inline, 0 general)

src/depot_map.h

➞

Show inline comments

@@ @@ -29,6 +29,9 @@ static inline bool IsDepotTypeTile(TileI @@
 		case TRANSPORT_WATER:
 			return IsShipDepotTile(tile);
 		case TRANSPORT_AIR:
 			return IsHangarTile(tile);
+	}
+}
@@ @@ -58,7 +61,7 @@ static inline DepotID GetDepotIndex(Tile @@
 /**
  * Get the type of vehicles that can use a depot
  * @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
  */
 static inline VehicleType GetDepotVehicleType(TileIndex t)

src/order_gui.cpp

➞

Show inline comments

@@ @@ -410,7 +410,8 @@ static Order GetOrderCmdFromTile(const V @@
 		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));
 		return order;
+	}

0 comments (0 inline, 0 general)