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/signs_gui.cpp
+++ b/src/signs_gui.cpp
@@ -516,7 +516,7 @@ struct SignWindow : Window, SignList {

 			case WID_QES_OK:
 				if (RenameSign(this->cur_sign, this->name_editbox.text.buf)) break;
-				/* FALL THROUGH */
+				FALLTHROUGH;

 			case WID_QES_CANCEL:
 				delete this;