Merge branch 'save_ext' into improved_breakdowns

# Conflicts:
#	src/vehicle.cpp
This commit is contained in:
Jonathan G Rennison
2017-08-15 19:17:12 +01:00
69 changed files with 385 additions and 214 deletions

View File

@@ -1480,7 +1480,7 @@ bool Vehicle::HandleBreakdown()
return (this->breakdown_type == BREAKDOWN_CRITICAL || this->breakdown_type == BREAKDOWN_EM_STOP);
}
/* FALL THROUGH */
FALLTHROUGH;
case 1:
/* Aircraft breakdowns end only when arriving at the airport */
if (this->type == VEH_AIRCRAFT) return false;