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/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -1423,7 +1423,7 @@ public:
 			case VIWD_AUTOREPLACE:
 				/* Autoreplace replaced the vehicle */
 				this->vehicle = Vehicle::Get(this->window_number);
-				/* FALL THROUGH */
+				FALLTHROUGH;

 			case VIWD_CONSIST_CHANGED:
 				/* Vehicle composition was changed. */