Update to 1.10.0

2020-04-01 14:50:45 +03:00
parent d4ae6a1d91
commit d01b776e2d
60 changed files with 690 additions and 219 deletions
@@ -261,7 +261,7 @@ static int ScriptOrderPositionToRealOrderPosition(VehicleID vehicle_id, ScriptOr
 				}
 			} else if (st->ship_station.tile != INVALID_TILE) {
 				TILE_AREA_LOOP(t, st->ship_station) {
-					if (IsDockTile(t) && GetStationIndex(t) == st->index) return t;
+					if (IsTileType(t, MP_STATION) && (IsDock(t) || IsOilRig(t)) && GetStationIndex(t) == st->index) return t;
 				}
 			} else if (st->bus_stops != nullptr) {
 				return st->bus_stops->xy;