Merge branch 'improved_breakdowns' into jgrpp

# Conflicts:
#	src/vehiclelist.cpp
This commit is contained in:
Jonathan G Rennison
2017-08-15 19:26:26 +01:00
60 changed files with 261 additions and 143 deletions

View File

@@ -140,7 +140,8 @@ public:
* waypoint. */
Yapf().DisableCache(true);
}
/* FALL THROUGH */
FALLTHROUGH;
case OT_GOTO_STATION:
m_destTile = CalcClosestStationTile(v->current_order.GetDestination(), v->tile, v->current_order.IsType(OT_GOTO_STATION) ? STATION_RAIL : STATION_WAYPOINT);
m_dest_station_id = v->current_order.GetDestination();