Merge upstream branch 1.8

2018-05-31 22:59:50 +03:00
parent 59edb9d606 080d57d97a
commit 66e3334f0e
240 changed files with 9656 additions and 2536 deletions
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -844,7 +844,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. */