Merge branch 'improved_breakdowns' into jgrpp

# Conflicts: # src/vehiclelist.cpp
2017-08-15 19:26:26 +01:00
parent 1d1718c226 2d66f25f6c
commit f34833f111
60 changed files with 261 additions and 143 deletions
--- a/src/saveload/company_sl.cpp
+++ b/src/saveload/company_sl.cpp
@@ -186,7 +186,7 @@ void AfterLoadCompanyStats()
 						}
 					}
 				}
-				/* FALL THROUGH */
+				FALLTHROUGH;

 			case MP_OBJECT:
 				if (GetWaterClass(tile) == WATER_CLASS_CANAL) {