Merge branch 'cpp-11' into save_ext

2017-08-15 18:44:36 +01:00
parent 843343fcf1 f3a0aace0c
commit 258e591f71
69 changed files with 385 additions and 214 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) {