Merge lp:~widelands-dev/widelands/gcc7 into lp:widelands

[Hans Joachim Desserud]

Added support for gcc7. Removed "redundant-decls" flag for Windows builds due to conflict between SDL and MinGW. New Macro FALLS_THROUGH; for use in switch statements. Got rid of predeclaration of Widelands::PlayerEndResult.

Hello,

You may have found this merge proposal while looking for a fix for the GCC7 build failure. This particular patch targets the development version, but fear not, we have also backported it for build19! You can find that version of the patch here: http://bazaar.launchpad.net/~widelands-dev/widelands/b19/revision/8149
See also the complete build19 branch as we've also updated the en_GB translation since the original build 19 shipped with a few translation mistakes: https://code.launchpad.net/~widelands-dev/widelands/b19.

So if you are a package maintainer or just trying to get Widelands build19 to build with GCC7, the patch above should get things working again :)

Original description:

(Note: at the moment this is mainly for testing, not merging. I think branches need a merge proposal in order to find build results from bunnybot, right?)

I don't remember the details, but we didn't add GCC7 in the last round of compiler updates due to some issue. Since then, Ubuntu has done a rebuild of the whole archive with GCC7 [1], and Widelands was among the build failures [2]. GCC 7.1 has now been officially released [3], so it is likely only a question of time before it becomes the default compiler on a lot of systems.

I pushed this branch now to check if we still have a build failure in the development version and if we do, it should naturally be fixed. It isn't unlikely that someone will look for a similar patch for build19 too in the future, so we should probably mark it in such a way that it is easily findable. Could save people some time and duplicated work, assuming the code hasn't changed too much in the meantime. For instance, distros tend to treat build failures pretty seriously since if they cannot build the package it becomes impossible to ship patches or updates to it so they will want to keep build19 buildable.

[1] more details on https://lists.ubuntu.com/archives/ubuntu-devel/2017-March/039749.html
[2] http://qa.ubuntuwire.org/ftbfs/rebuilds/test-rebuild-20170322.1-gcc7-zesty.html
[3] https://gcc.gnu.org/gcc-7/

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2146. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/228487468.
Appveyor build 1981. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_gcc7-1981.

[GunChleoc (gunchleoc)]

Yes, merge requests are the way to ping bunnybot.

Travis still doesn't have GCC7 out of the box, but we could try this:

https://docs.travis-ci.com/user/installing-dependencies/#Installing-Packages-from-a-custom-APT-repository

[Hans Joachim Desserud (hjd)]

>Travis still doesn't have GCC7 out of the box, but we could try this:

We already do :)

If you check `.travis.sh`, we add the Ubuntu toolchain PPA [1] before attempting to install gcc. It contains gcc-7, but on closer inspection that package is only published for 17.04. (I believe Travis is still running 14.04 images)

So it should have worked if the package had been available ;) I'll do some digging and see if there's a plan to add GCC7 for older releases now that it has been officially released.

[1] https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test

[GunChleoc (gunchleoc)]

I guess the package to keep watching is this one:

https://launchpad.net/ubuntu/+source/gcc-7

[SirVer (sirver)]

Seems like this one can go back to in progress, right?

[Hans Joachim Desserud (hjd)]

The gcc-7 package should be available now https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test?field.series_filter=trusty. I've merged latest trunk a couple of times, but it didn't seem like bunnybot picked up the changes.

I suspect this might be related to the MP status, so I've taken the liberty of moving it back to needs review.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2266. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/238045527.
Appveyor build 2101. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_gcc7-2101.

[GunChleoc (gunchleoc)]

And it's working :)

The Travis failure is a compiler error that's only thrown by GCC7.

[GunChleoc (gunchleoc)]

P.S: we're getting a lot of warnings generated by -Wimplicit-fallthrough now, we should check whether these are useful to us once the compiler goes through.

[Hans Joachim Desserud (hjd)]

>The Travis failure is a compiler error that's only thrown by GCC7.

In fact, only the release build. The debug build is fine, not that I know what the difference might be. (I honestly didn't expect any errors now since I've built it successfully with gcc 7.x on arch)

-Wimplicit-fallthrough sounds potentially useful, but again I haven't looked at the results.

[GunChleoc (gunchleoc)]

I have had a look at the results from the debug build, it's 10 warnings for intended fallthroughs. We could disable the compiler flag around them, it's not that many after all.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2273. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/239238959.
Appveyor build 2108. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_gcc7-2108.

[GunChleoc (gunchleoc)]

Travis logs should be clean now, except for a warning with buffer size in a map_io packet. Since I already have a macro purge branch setup for that one, I'd rather not deal with the merge conflicts.

I'm not happy with the code duplication caused by the new GCC7_DIAG_ON/OFF macros, but it's the best I can do without installing gcc7.

review: Needs Resubmitting

[kaputtnik (franku)]

Could compile a release build with gcc 7.1

As far as i can see i get no warnings any more.

review: Approve (testing)

[SirVer (sirver)]

qq: why not use __attribute__ ((fallthrough)); [1] to get rid of the warnings? This is slightly ugly - so we could hide it in a macro:

#define FALLTHROUGH_INTENDED __attribute__ ((fallthrough))

This would make it explicit that we did intend for this to fall through. It should also be compatible across all compilers.

[1] https://developers.redhat.com/blog/2017/03/10/wimplicit-fallthrough-in-gcc-7/

[GunChleoc (gunchleoc)]

A macro is much better, thank you :)

Travis & AppVeyor logs are clean now, so let's get this in.

@bunnybot merge

=== modified file '.travis.yml'
--- .travis.yml	2017-02-13 17:15:49 +0000
+++ .travis.yml	2017-06-15 16:43:33 +0000
@@ -36,14 +36,14 @@
      - compiler: gcc
        env: GCC_VERSION="4.9" BUILD_TYPE="Debug"
      - compiler: gcc
-       env: GCC_VERSION="5" BUILD_TYPE="Debug"
-     - compiler: gcc
        env: GCC_VERSION="6" BUILD_TYPE="Debug"
      - compiler: gcc
+       env: GCC_VERSION="7" BUILD_TYPE="Debug"
+     - compiler: gcc
        env: GCC_VERSION="4.8" BUILD_TYPE="Release"
      - compiler: gcc
        env: GCC_VERSION="4.9" BUILD_TYPE="Release"
      - compiler: gcc
-       env: GCC_VERSION="5" BUILD_TYPE="Release"
-     - compiler: gcc
        env: GCC_VERSION="6" BUILD_TYPE="Release"
+     - compiler: gcc
+       env: GCC_VERSION="7" BUILD_TYPE="Release"

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-06-01 13:50:48 +0000
+++ CMakeLists.txt	2017-06-15 16:43:33 +0000
@@ -127,7 +127,6 @@
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-padded")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-sign-conversion")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-missing-noreturn")
-  wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-implicit-fallthrough")
 
   # TODO(sirver): weak-vtables should be enabled, but leads to lot of errors right now.
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-weak-vtables")
@@ -143,6 +142,9 @@
   if(WIN32)
     # This is needed for getenv().
     wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=gnu++11")
+  else()
+    # SDL and MinGW both declare 'unsigned int __builtin_ia32_crc32qi(unsigned int, unsigned char)', resulting in lots of warnings. So, we can't have this flag in Windows.
+    wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wredundant-decls")
   endif()
 
   # Because of: https://svn.boost.org/trac/boost/ticket/9240.
@@ -165,7 +167,6 @@
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Woverlength-strings")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wpacked")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wpointer-arith")
-  wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wredundant-decls")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wsign-promo")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wsync-nand")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wtrampolines")

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2017-05-14 20:06:48 +0000
+++ src/CMakeLists.txt	2017-06-15 16:43:33 +0000
@@ -116,6 +116,7 @@
     logic
     logic_game_controller
     logic_game_settings
+    logic_single_player_game_settings
     map_io_map_loader
     network
     profile

=== modified file 'src/base/macros.h'
--- src/base/macros.h	2017-01-25 18:55:59 +0000
+++ src/base/macros.h	2017-06-15 16:43:33 +0000
@@ -67,6 +67,18 @@
 #define DIAG_OFF(x) GCC_DIAG_OFF(x) CLANG_DIAG_OFF(x)
 #define DIAG_ON(x) GCC_DIAG_ON(x) CLANG_DIAG_ON(x)
 
+// For switch statements: Tell gcc7 and clang that a fallthrough is intended
+// https://developers.redhat.com/blog/2017/03/10/wimplicit-fallthrough-in-gcc-7/
+#ifdef __clang__
+#define FALLS_THROUGH /* Falls through */ \
+	[[clang::fallthrough]]
+#elif __GNUC__ >= 7
+#define FALLS_THROUGH /* Falls through */ \
+	[[gnu::fallthrough]]
+#else
+#define FALLS_THROUGH /* Falls through */
+#endif
+
 // disallow copying or assigning a class
 #define DISALLOW_COPY_AND_ASSIGN(TypeName)                                                         \
 	TypeName(const TypeName&) = delete;                                                             \

=== modified file 'src/graphic/gl/fill_rect_program.cc'
--- src/graphic/gl/fill_rect_program.cc	2017-01-25 18:55:59 +0000
+++ src/graphic/gl/fill_rect_program.cc	2017-06-15 16:43:33 +0000
@@ -21,7 +21,7 @@
 
 #include <vector>
 
-#include "base/log.h"
+#include "base/macros.h"
 #include "base/wexception.h"
 
 // static
@@ -66,7 +66,7 @@
 		switch (template_args.blend_mode) {
 		case BlendMode::Subtract:
 			glBlendEquation(GL_FUNC_REVERSE_SUBTRACT);
-		/* fallthrough intended */
+			FALLS_THROUGH;
 		case BlendMode::UseAlpha:
 			glBlendFunc(GL_ONE, GL_ONE);
 			break;
@@ -132,7 +132,7 @@
 		switch (template_args.blend_mode) {
 		case BlendMode::Subtract:
 			glBlendEquation(GL_FUNC_ADD);
-		/* fallthrough intended */
+			FALLS_THROUGH;
 		case BlendMode::UseAlpha:
 			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 			break;

=== modified file 'src/logic/CMakeLists.txt'
--- src/logic/CMakeLists.txt	2017-05-21 11:16:46 +0000
+++ src/logic/CMakeLists.txt	2017-06-15 16:43:33 +0000
@@ -6,17 +6,26 @@
 
 wl_library(logic_game_settings
   SRCS
+    game_settings.cc
     game_settings.h
+    player_end_result.h
+  DEPENDS
+    io_filesystem
+    logic
+    logic_constants
+    scripting_lua_interface
+    scripting_lua_table
+)
+
+wl_library(logic_single_player_game_settings
+  SRCS
     single_player_game_settings_provider.cc
     single_player_game_settings_provider.h
   DEPENDS
     ai
     base_exceptions
-    io_filesystem
     logic
-    logic_constants
-    scripting_lua_interface
-    scripting_lua_table
+    logic_game_settings
 )
 
 wl_library(logic_game_controller
@@ -30,6 +39,7 @@
     ai
     logic
     logic_constants
+    logic_game_settings
     profile
     ui_basic
     wui

=== modified file 'src/logic/game_controller.h'
--- src/logic/game_controller.h	2017-01-25 18:55:59 +0000
+++ src/logic/game_controller.h	2017-06-15 16:43:33 +0000
@@ -22,12 +22,12 @@
 
 #include <string>
 
+#include "logic/player_end_result.h"
 #include "logic/widelands.h"
 
 namespace Widelands {
 class Game;
 class PlayerCommand;
-enum class PlayerEndResult : uint8_t;
 }
 
 /**

=== added file 'src/logic/game_settings.cc'
--- src/logic/game_settings.cc	1970-01-01 00:00:00 +0000
+++ src/logic/game_settings.cc	2017-06-15 16:43:33 +0000
@@ -0,0 +1,1 @@
+// Dummy to make CMake happy

=== modified file 'src/logic/game_settings.h'
--- src/logic/game_settings.h	2017-02-10 14:12:36 +0000
+++ src/logic/game_settings.h	2017-06-15 16:43:33 +0000
@@ -26,14 +26,11 @@
 
 #include "io/filesystem/layered_filesystem.h"
 #include "logic/map_objects/tribes/tribe_basic_info.h"
+#include "logic/player_end_result.h"
 #include "logic/widelands.h"
 #include "scripting/lua_interface.h"
 #include "scripting/lua_table.h"
 
-namespace Widelands {
-enum class PlayerEndResult : uint8_t;
-}
-
 struct PlayerSettings {
 	enum State { stateOpen, stateHuman, stateComputer, stateClosed, stateShared };
 
@@ -60,6 +57,12 @@
 		return not_connected() - 1;
 	}
 
+	UserSettings(Widelands::PlayerEndResult init_result, bool init_ready)
+	   : position(0), name(""), result(init_result), win_condition_string(""), ready(init_ready) {
+	}
+	UserSettings() : UserSettings(Widelands::PlayerEndResult::kUndefined, false) {
+	}
+
 	uint8_t position;
 	std::string name;
 	Widelands::PlayerEndResult result;

=== modified file 'src/logic/map_objects/immovable.cc'
--- src/logic/map_objects/immovable.cc	2017-04-23 12:11:19 +0000
+++ src/logic/map_objects/immovable.cc	2017-06-15 16:43:33 +0000
@@ -986,7 +986,7 @@
 				probability = value;
 				//  fallthrough
 			}
-			/* no break */
+			FALLS_THROUGH;
 			case '\0':
 				goto end;
 			default:

=== modified file 'src/logic/map_objects/tribes/battle.cc'
--- src/logic/map_objects/tribes/battle.cc	2017-05-20 19:54:02 +0000
+++ src/logic/map_objects/tribes/battle.cc	2017-06-15 16:43:33 +0000
@@ -130,7 +130,6 @@
 }
 
 Soldier* Battle::opponent(const Soldier& soldier) const {
-	assert(&soldier != nullptr);
 	assert(first_ == &soldier || second_ == &soldier);
 	Soldier* other_soldier = first_ == &soldier ? second_ : first_;
 	return other_soldier;

=== modified file 'src/logic/map_objects/tribes/production_program.cc'
--- src/logic/map_objects/tribes/production_program.cc	2017-02-28 12:59:39 +0000
+++ src/logic/map_objects/tribes/production_program.cc	2017-06-15 16:43:33 +0000
@@ -263,9 +263,8 @@
 				                    "the specified ware type(s) is only %u, so the group can "
 				                    "never be fulfilled by the site",
 				                    count, count_max);
-			//  fallthrough
 		}
-		/* no break */
+		FALLS_THROUGH;
 		case '\0':
 		case ' ':
 			group.second = count;

=== modified file 'src/logic/map_objects/tribes/ship.cc'
--- src/logic/map_objects/tribes/ship.cc	2017-05-03 07:24:06 +0000
+++ src/logic/map_objects/tribes/ship.cc	2017-06-15 16:43:33 +0000
@@ -275,14 +275,13 @@
 			return;
 		}
 		log("Oh no... this ship has no sinking animation :(!\n");
-	// fall trough
+		FALLS_THROUGH;
 	case ShipStates::kSinkAnimation:
 		// The sink animation has been played, so finally remove the ship from the map
 		pop_task(game);
 		remove(game);
 		return;
 	}
-
 	// if the real update function failed (e.g. nothing to transport), the ship goes idle
 	ship_update_idle(game, state);
 }
@@ -686,7 +685,7 @@
 			return start_task_idle(game, descr().main_animation(), 1500);
 		}
 	}
-
+		FALLS_THROUGH;
 	case ShipStates::kExpeditionWaiting:
 	case ShipStates::kExpeditionPortspaceFound:
 	case ShipStates::kSinkRequest:

=== modified file 'src/logic/mapfringeregion.cc'
--- src/logic/mapfringeregion.cc	2017-01-25 18:55:59 +0000
+++ src/logic/mapfringeregion.cc	2017-06-15 16:43:33 +0000
@@ -29,9 +29,11 @@
 		if (area_.radius) {
 			remaining_in_phase_ = area_.radius;
 			phase_ = 6;
-		} else
+			// Fallthrough
+		} else {
 			return false;
-	/* no break */
+		}
+		FALLS_THROUGH;
 	case 1:
 		map.get_trn(area_, &area_);
 		break;
@@ -53,6 +55,7 @@
 	default:
 		NEVER_HERE();
 	}
+
 	if (--remaining_in_phase_ == 0) {
 		remaining_in_phase_ = area_.radius;
 		--phase_;
@@ -66,9 +69,11 @@
 		if (area_.radius) {
 			remaining_in_phase_ = area_.radius;
 			phase_ = 6;
-		} else
+			// Fallthrough
+		} else {
 			return false;
-	/* no break */
+		}
+		FALLS_THROUGH;
 	case 1:
 		map.get_trn(area_, &area_);
 		break;
@@ -90,6 +95,7 @@
 	default:
 		NEVER_HERE();
 	}
+
 	if (--remaining_in_phase_ == 0) {
 		remaining_in_phase_ = area_.radius;
 		--phase_;

=== added file 'src/logic/player_end_result.h'
--- src/logic/player_end_result.h	1970-01-01 00:00:00 +0000
+++ src/logic/player_end_result.h	2017-06-15 16:43:33 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2008-2017 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
+#ifndef WL_LOGIC_PLAYER_END_RESULT_H
+#define WL_LOGIC_PLAYER_END_RESULT_H
+
+namespace Widelands {
+enum class PlayerEndResult : uint8_t {
+	kLost = 0,
+	kWon = 1,
+	kResigned = 2,
+	kUndefined = 255
+};
+}
+
+#endif  // end of include guard: WL_LOGIC_PLAYER_END_RESULT_H

=== modified file 'src/logic/playersmanager.h'
--- src/logic/playersmanager.h	2017-01-25 18:55:59 +0000
+++ src/logic/playersmanager.h	2017-06-15 16:43:33 +0000
@@ -24,6 +24,7 @@
 #include <vector>
 
 #include "graphic/playercolor.h"
+#include "logic/player_end_result.h"
 #include "logic/widelands.h"
 
 namespace Widelands {
@@ -32,13 +33,6 @@
 class Player;
 class Player;
 
-enum class PlayerEndResult : uint8_t {
-	PLAYER_LOST = 0,
-	PLAYER_WON = 1,
-	PLAYER_RESIGNED = 2,
-	UNDEFINED = 255
-};
-
 /**
  * Hold data once a player left the game, or on game ends.
  * Allowed values for the info string, as key=value pairs separated

=== modified file 'src/logic/single_player_game_controller.h'
--- src/logic/single_player_game_controller.h	2017-01-25 18:55:59 +0000
+++ src/logic/single_player_game_controller.h	2017-06-15 16:43:33 +0000
@@ -22,6 +22,7 @@
 
 #include "ai/computer_player.h"
 #include "logic/game_controller.h"
+#include "logic/player_end_result.h"
 
 class SinglePlayerGameController : public GameController {
 public:

=== modified file 'src/network/gameclient.cc'
--- src/network/gameclient.cc	2017-05-14 06:50:28 +0000
+++ src/network/gameclient.cc	2017-06-15 16:43:33 +0000
@@ -460,8 +460,7 @@
 
 	// This might happen, if a users connects after the game starts.
 	if (number == d->settings.users.size()) {
-		UserSettings newuser;
-		d->settings.users.push_back(newuser);
+		d->settings.users.push_back(*new UserSettings());
 	}
 
 	d->settings.users.at(number).name = packet.string();

=== modified file 'src/network/gameclient.h'
--- src/network/gameclient.h	2017-06-10 16:36:29 +0000
+++ src/network/gameclient.h	2017-06-15 16:43:33 +0000
@@ -23,6 +23,7 @@
 #include "chat/chat.h"
 #include "logic/game_controller.h"
 #include "logic/game_settings.h"
+#include "logic/player_end_result.h"
 #include "network/netclient.h"
 
 struct GameClientImpl;

=== modified file 'src/network/gamehost.cc'
--- src/network/gamehost.cc	2017-05-14 06:50:28 +0000
+++ src/network/gamehost.cc	2017-06-15 16:43:33 +0000
@@ -143,7 +143,7 @@
 				newstate = PlayerSettings::stateClosed;
 				break;
 			}  // else fall through
-		      /* no break */
+		      FALLS_THROUGH;
 		case PlayerSettings::stateComputer: {
 			const ComputerPlayer::ImplementationVector& impls = ComputerPlayer::get_implementations();
 			ComputerPlayer::ImplementationVector::const_iterator it = impls.begin();
@@ -1592,14 +1592,14 @@
 		for (uint32_t i = 0; i < d->settings.users.size(); ++i)
 			if (d->settings.users[i].position == UserSettings::not_connected()) {
 				client.usernum = i;
-				d->settings.users[i].result = Widelands::PlayerEndResult::UNDEFINED;
+				d->settings.users[i].result = Widelands::PlayerEndResult::kUndefined;
 				d->settings.users[i].ready = true;
 				break;
 			}
 	if (client.usernum == -1) {
 		client.usernum = d->settings.users.size();
 		UserSettings newuser;
-		newuser.result = Widelands::PlayerEndResult::UNDEFINED;
+		newuser.result = Widelands::PlayerEndResult::kUndefined;
 		newuser.ready = true;
 		d->settings.users.push_back(newuser);
 	}
@@ -2371,7 +2371,7 @@
 		if (user.position == p_nr - 1) {
 			user.result = result;
 			user.win_condition_string = info;
-			if (result == Widelands::PlayerEndResult::PLAYER_LOST) {
+			if (result == Widelands::PlayerEndResult::kLost) {
 				send_system_message_code("PLAYER_DEFEATED", user.name);
 			}
 		}

=== modified file 'src/network/gamehost.h'
--- src/network/gamehost.h	2017-05-10 18:06:13 +0000
+++ src/network/gamehost.h	2017-06-15 16:43:33 +0000
@@ -22,6 +22,7 @@
 
 #include "logic/game_controller.h"
 #include "logic/game_settings.h"
+#include "logic/player_end_result.h"
 #include "logic/widelands.h"
 #include "network/nethost.h"
 #include "network/network.h"

=== modified file 'src/scripting/CMakeLists.txt'
--- src/scripting/CMakeLists.txt	2017-02-28 12:59:39 +0000
+++ src/scripting/CMakeLists.txt	2017-06-15 16:43:33 +0000
@@ -111,6 +111,7 @@
     logic_campaign_visibility
     logic_constants
     logic_game_controller
+    logic_game_settings
     logic_widelands_geometry
     map_io
     scripting_base

=== modified file 'src/scripting/lua_game.cc'
--- src/scripting/lua_game.cc	2017-05-09 09:18:14 +0000
+++ src/scripting/lua_game.cc	2017-06-15 16:43:33 +0000
@@ -32,6 +32,7 @@
 #include "logic/objective.h"
 #include "logic/path.h"
 #include "logic/player.h"
+#include "logic/player_end_result.h"
 #include "logic/playersmanager.h"
 #include "scripting/globals.h"
 #include "scripting/lua_interface.h"

=== modified file 'src/ui_basic/dropdown.cc'
--- src/ui_basic/dropdown.cc	2017-05-08 09:26:55 +0000
+++ src/ui_basic/dropdown.cc	2017-06-15 16:43:33 +0000
@@ -291,6 +291,7 @@
 			if (list_->is_visible()) {
 				set_value();
 			}
+			break;
 		case SDLK_ESCAPE:
 			if (list_->is_visible()) {
 				list_->select(current_selection_);

=== modified file 'src/ui_basic/editbox.cc'
--- src/ui_basic/editbox.cc	2017-05-25 12:30:40 +0000
+++ src/ui_basic/editbox.cc	2017-06-15 16:43:33 +0000
@@ -209,15 +209,16 @@
 			if (code.mod & KMOD_NUM) {
 				break;
 			}
-		/* no break */
+			FALLS_THROUGH;
 		case SDLK_DELETE:
 			if (m_->caret < m_->text.size()) {
 				while ((m_->text[++m_->caret] & 0xc0) == 0x80) {
 				};
-				// now handle it like Backspace
-			} else
+				// Now fallthrough to handle it like Backspace
+			} else {
 				return true;
-		/* no break */
+			}
+			FALLS_THROUGH;
 		case SDLK_BACKSPACE:
 			if (m_->caret > 0) {
 				while ((m_->text[--m_->caret] & 0xc0) == 0x80)
@@ -232,7 +233,7 @@
 			if (code.mod & KMOD_NUM) {
 				break;
 			}
-		/* no break */
+			FALLS_THROUGH;
 		case SDLK_LEFT:
 			if (m_->caret > 0) {
 				while ((m_->text[--m_->caret] & 0xc0) == 0x80) {
@@ -250,7 +251,7 @@
 			if (code.mod & KMOD_NUM) {
 				break;
 			}
-		/* no break */
+			FALLS_THROUGH;
 		case SDLK_RIGHT:
 			if (m_->caret < m_->text.size()) {
 				while ((m_->text[++m_->caret] & 0xc0) == 0x80) {
@@ -270,7 +271,7 @@
 			if (code.mod & KMOD_NUM) {
 				break;
 			}
-		/* no break */
+			FALLS_THROUGH;
 		case SDLK_HOME:
 			if (m_->caret != 0) {
 				m_->caret = 0;
@@ -283,7 +284,7 @@
 			if (code.mod & KMOD_NUM) {
 				break;
 			}
-		/* no break */
+			FALLS_THROUGH;
 		case SDLK_END:
 			if (m_->caret != m_->text.size()) {
 				m_->caret = m_->text.size();
@@ -295,7 +296,7 @@
 			if (code.mod & KMOD_NUM) {
 				break;
 			}
-		/* no break */
+			FALLS_THROUGH;
 		case SDLK_UP:
 			// Load entry from history if active and text is not empty
 			if (history_active_) {
@@ -313,7 +314,7 @@
 			if (code.mod & KMOD_NUM) {
 				break;
 			}
-		/* no break */
+			FALLS_THROUGH;
 		case SDLK_DOWN:
 			// Load entry from history if active and text is not equivalent to the current one
 			if (history_active_) {

=== modified file 'src/ui_basic/listselect.cc'
--- src/ui_basic/listselect.cc	2017-05-25 12:30:40 +0000
+++ src/ui_basic/listselect.cc	2017-06-15 16:43:33 +0000
@@ -509,9 +509,10 @@
 		uint32_t selected_idx;
 		switch (code.sym) {
 		case SDLK_KP_2:
-			if (code.mod & KMOD_NUM)
+			if (code.mod & KMOD_NUM) {
 				break;
-		/* no break */
+			}
+			FALLS_THROUGH;
 		case SDLK_DOWN:
 			selected_idx = selection_index() + 1;
 			if (selected_idx < size())
@@ -523,9 +524,10 @@
 			}
 			return true;
 		case SDLK_KP_8:
-			if (code.mod & KMOD_NUM)
+			if (code.mod & KMOD_NUM) {
 				break;
-		/* no break */
+			}
+			FALLS_THROUGH;
 		case SDLK_UP:
 			selected_idx = selection_index();
 			if (selected_idx > 0)

=== modified file 'src/ui_basic/multilineeditbox.cc'
--- src/ui_basic/multilineeditbox.cc	2017-05-14 04:38:39 +0000
+++ src/ui_basic/multilineeditbox.cc	2017-06-15 16:43:33 +0000
@@ -237,9 +237,10 @@
 			// Let the panel handle the tab key
 			return get_parent()->handle_key(true, code);
 		case SDLK_KP_PERIOD:
-			if (code.mod & KMOD_NUM)
+			if (code.mod & KMOD_NUM) {
 				break;
-		/* no break */
+			}
+			FALLS_THROUGH;
 		case SDLK_DELETE:
 			if (d_->cursor_pos < d_->text.size()) {
 				d_->erase_bytes(d_->cursor_pos, d_->next_char(d_->cursor_pos));
@@ -258,7 +259,7 @@
 			if (code.mod & KMOD_NUM) {
 				break;
 			}
-		/* no break */
+			FALLS_THROUGH;
 		case SDLK_LEFT: {
 			if (code.mod & (KMOD_LCTRL | KMOD_RCTRL)) {
 				uint32_t newpos = d_->prev_char(d_->cursor_pos);
@@ -281,7 +282,7 @@
 			if (code.mod & KMOD_NUM) {
 				break;
 			}
-		/* no break */
+			FALLS_THROUGH;
 		case SDLK_RIGHT:
 			if (code.mod & (KMOD_LCTRL | KMOD_RCTRL)) {
 				uint32_t newpos = d_->next_char(d_->cursor_pos);
@@ -299,7 +300,7 @@
 			if (code.mod & KMOD_NUM) {
 				break;
 			}
-		/* no break */
+			FALLS_THROUGH;
 		case SDLK_DOWN:
 			if (d_->cursor_pos < d_->text.size()) {
 				d_->refresh_ww();
@@ -328,7 +329,7 @@
 			if (code.mod & KMOD_NUM) {
 				break;
 			}
-		/* no break */
+			FALLS_THROUGH;
 		case SDLK_UP:
 			if (d_->cursor_pos > 0) {
 				d_->refresh_ww();
@@ -355,7 +356,7 @@
 			if (code.mod & KMOD_NUM) {
 				break;
 			}
-		/* no break */
+			FALLS_THROUGH;
 		case SDLK_HOME:
 			if (code.mod & (KMOD_LCTRL | KMOD_RCTRL)) {
 				d_->set_cursor_pos(0);
@@ -373,7 +374,7 @@
 			if (code.mod & KMOD_NUM) {
 				break;
 			}
-		/* no break */
+			FALLS_THROUGH;
 		case SDLK_END:
 			if (code.mod & (KMOD_LCTRL | KMOD_RCTRL)) {
 				d_->set_cursor_pos(d_->text.size());

=== modified file 'src/ui_fsmenu/loadgame.cc'
--- src/ui_fsmenu/loadgame.cc	2017-05-14 06:01:19 +0000
+++ src/ui_fsmenu/loadgame.cc	2017-06-15 16:43:33 +0000
@@ -678,9 +678,10 @@
 
 	switch (code.sym) {
 	case SDLK_KP_PERIOD:
-		if (code.mod & KMOD_NUM)
+		if (code.mod & KMOD_NUM) {
 			break;
-	/* no break */
+		}
+		FALLS_THROUGH;
 	case SDLK_DELETE:
 		clicked_delete();
 		return true;

=== modified file 'src/wui/buildingwindow.cc'
--- src/wui/buildingwindow.cc	2017-06-06 05:37:57 +0000
+++ src/wui/buildingwindow.cc	2017-06-15 16:43:33 +0000
@@ -78,7 +78,7 @@
 		// The building is no more
 		case Widelands::NoteBuilding::Action::kStartWarp:
 			igbase()->add_wanted_building_window(building().get_position(), get_pos(), is_minimal());
-		// Fallthrough intended
+		FALLS_THROUGH;
 		case Widelands::NoteBuilding::Action::kDeleted:
 			die();
 			break;

=== modified file 'src/wui/game_summary.cc'
--- src/wui/game_summary.cc	2017-05-14 14:40:24 +0000
+++ src/wui/game_summary.cc	2017-06-15 16:43:33 +0000
@@ -28,6 +28,7 @@
 #include "logic/game.h"
 #include "logic/game_controller.h"
 #include "logic/player.h"
+#include "logic/player_end_result.h"
 #include "logic/playersmanager.h"
 #include "ui_basic/box.h"
 #include "ui_basic/button.h"
@@ -143,7 +144,7 @@
 		Widelands::PlayerEndStatus pes = players_status.at(i);
 		if (ipl && pes.player == ipl->player_number()) {
 			local_in_game = true;
-			local_won = pes.result == Widelands::PlayerEndResult::PLAYER_WON;
+			local_won = pes.result == Widelands::PlayerEndResult::kWon;
 			current_player_position = i;
 		}
 		Widelands::Player* p = game_.get_player(pes.player);
@@ -160,11 +161,11 @@
 		// Status
 		std::string stat_str;
 		switch (pes.result) {
-		case Widelands::PlayerEndResult::PLAYER_LOST:
+		case Widelands::PlayerEndResult::kLost:
 			/** TRANSLATORS: This is shown in the game summary for the players who have lost. */
 			stat_str = _("Lost");
 			break;
-		case Widelands::PlayerEndResult::PLAYER_WON:
+		case Widelands::PlayerEndResult::kWon:
 			/** TRANSLATORS: This is shown in the game summary for the players who have won. */
 			stat_str = _("Won");
 			if (!single_won) {
@@ -173,11 +174,11 @@
 				teawon_ = p->team_number();
 			}
 			break;
-		case Widelands::PlayerEndResult::PLAYER_RESIGNED:
+		case Widelands::PlayerEndResult::kResigned:
 			/** TRANSLATORS: This is shown in the game summary for the players who have resigned. */
 			stat_str = _("Resigned");
 			break;
-		case Widelands::PlayerEndResult::UNDEFINED:
+		case Widelands::PlayerEndResult::kUndefined:
 			/** TRANSLATORS: This is shown in the game summary when we don't know */
 			/** TRANSLATORS: if the player has lost or won. */
 			stat_str = pgettext("player_won", "Unknown");

=== modified file 'src/wui/interactive_base.cc'
--- src/wui/interactive_base.cc	2017-05-25 12:30:40 +0000
+++ src/wui/interactive_base.cc	2017-06-15 16:43:33 +0000
@@ -754,9 +754,10 @@
 	if (down) {
 		switch (code.sym) {
 		case SDLK_KP_9:
-			if (code.mod & KMOD_NUM)
+			if (code.mod & KMOD_NUM) {
 				break;
-		/* no break */
+			}
+			FALLS_THROUGH;
 		case SDLK_PAGEUP:
 			if (upcast(Game, game, &egbase_)) {
 				if (GameController* const ctrl = game->game_controller()) {
@@ -774,9 +775,10 @@
 			return true;
 
 		case SDLK_KP_3:
-			if (code.mod & KMOD_NUM)
+			if (code.mod & KMOD_NUM) {
 				break;
-		/* no break */
+			}
+			FALLS_THROUGH;
 		case SDLK_PAGEDOWN:
 			if (upcast(Widelands::Game, game, &egbase_)) {
 				if (GameController* const ctrl = game->game_controller()) {

=== modified file 'src/wui/interactive_player.cc'
--- src/wui/interactive_player.cc	2017-02-22 20:23:49 +0000
+++ src/wui/interactive_player.cc	2017-06-15 16:43:33 +0000
@@ -272,7 +272,7 @@
 		case SDLK_KP_7:
 			if (code.mod & KMOD_NUM)
 				break;
-		/* no break */
+		FALLS_THROUGH;
 		case SDLK_HOME:
 			scroll_to_field(game().map().get_starting_pos(player_number_), Transition::Smooth);
 			return true;