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/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -270,9 +270,10 @@ public:
 					this->sel_index = y;
 					this->SetDirty();
 				}
-				/* FALL THROUGH, when double-clicking. */
+				/* When double-clicking, continue */
 				if (click_count == 1 || y < 0) break;
 			}
+			FALLTHROUGH;

 			case WID_TA_EXECUTE:
 				DoCommandP(this->town->xy, this->window_number, this->sel_index, CMD_DO_TOWN_ACTION | CMD_MSG(STR_ERROR_CAN_T_DO_THIS));