Merge branch 'save_ext' into cargo_type_order

# Conflicts: # src/core/smallstack_type.hpp
2018-07-02 18:52:22 +01:00
parent c60bc7be1a 373ff3dd4e
commit 0ae32838ea
534 changed files with 24037 additions and 9447 deletions
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -1267,7 +1267,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. */