Merge lp:~widelands-dev/widelands/bug-1823612-llvm8-build-errors into lp:widelands

[GunChleoc]

Fix compile errors for clang 8.

I am still on Clang 6, so we have to wait for Travis to see if this is indeed fixed.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4702. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/517666765.
Appveyor build 4488. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1823612_llvm8_build_errors-4488.

[GunChleoc (gunchleoc)]

This is ready for review now, targeted at Build 20.

review: Needs Resubmitting

[hessenfarmer (stephan-lutz)]

Found at least one questionable change in ai code see inline.
needs intensive testing of programs especially for the mines

[TiborB (tiborb95)]

Yes, it is obviously a typo but I suggest not to touch it unless it is followed by some training. BTW, I plan to came return and spend some time on AI in about two months....

[hessenfarmer (stephan-lutz)]

BTW: what was the reason for change the Program result code, as the previous revision did already compile with clang 8?

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4706. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/517922834.
Appveyor build 4492. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1823612_llvm8_build_errors-4492.

[GunChleoc (gunchleoc)]

Which changes do you mean exactly? Please point me to the commit in the commit log for this branch, or to the line in the code.

All that the AI change does is to assign a value to the same element only once instead of twice. Do you want me to record the value assignment that I deleted in a comment?

[TiborB (tiborb95)]

@Gun, I am not sure whom you are asking, but still I left the comment in the code....

[hessenfarmer (stephan-lutz)]

@Tibor:

I think that was addressed to my question. I was just wondering what is the reason behind commit 9048. I am a little bit concerned due to the commit message whether the programs still work as desired. Especially whether the statistics fix (result no-stats) still works.

[hessenfarmer (stephan-lutz)]

for the AI part we could leave this as it is now (i.e. nothing has changed) and record a bug to fix inputs[19] in this part of the code.

[TiborB (tiborb95)]

@hessenfarmer - the bug is too much as no real harm is done here, todo in the code would be enough....

[GunChleoc (gunchleoc)]

I have added a TODO to the AI code.

I have verified that no_stats is not affected by the bugfix in the production programs. I don't know if we ever entered the buggy state, but if we did, this will actually fix the stats: If duration was not set for these programs, Widelands would have picked a duration between 0 and 3 ms, depending on the ID of the current program state (Failed, Skipped, Completed..). Now, the duration is always 0 ms like it should be.

[hessenfarmer (stephan-lutz)]

ok thanks for the explanation.
did some playtesting. Found no anomalies.

review: Approve (test)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4709. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/518396046.
Appveyor build 4495. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1823612_llvm8_build_errors-4495.

[GunChleoc (gunchleoc)]

Thanks!

Let's have it.

@bunnybot merge

=== modified file 'src/ai/ai_help_structs.cc'
--- src/ai/ai_help_structs.cc	2019-02-23 11:00:49 +0000
+++ src/ai/ai_help_structs.cc	2019-04-10 16:40:56 +0000
@@ -1148,12 +1148,12 @@
 		if (this_player_team != mytn) {
 			log("%2d: Team changed %d -> %d\n", pn, this_player_team, mytn);
 			this_player_team = mytn;
-		};
+		}
 		if (all_stats[opn].team_number != pltn) {
 			log("%2d: Team changed for player %d: %d -> %d\n", pn, opn, all_stats[opn].team_number,
 			    pltn);
 			all_stats[opn].team_number = pltn;
-		};
+		}
 	}
 }
 
@@ -1248,7 +1248,7 @@
 uint32_t PlayersStrengths::get_player_power(Widelands::PlayerNumber pn) {
 	if (all_stats.count(pn) > 0) {
 		return all_stats[pn].players_power;
-	};
+	}
 	return 0;
 }
 
@@ -1256,7 +1256,7 @@
 uint32_t PlayersStrengths::get_player_land(Widelands::PlayerNumber pn) {
 	if (all_stats.count(pn) > 0) {
 		return all_stats[pn].players_land;
-	};
+	}
 	return 0;
 }
 
 
=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc	2019-03-24 13:13:34 +0000
+++ src/ai/defaultai.cc	2019-04-10 16:40:56 +0000
@@ -327,7 +327,7 @@
 		case SchedulerTaskId::kRoadCheck:
 			if (check_economies()) {  // is a must
 				return;
-			};
+			}
 			set_taskpool_task_time(gametime + 1000, SchedulerTaskId::kRoadCheck);
 			// testing 5 roads
 			{
@@ -337,7 +337,7 @@
 					if (improve_roads(gametime)) {
 						// if significant change takes place do not go on
 						break;
-					};
+					}
 				}
 			}
 			break;
@@ -380,7 +380,7 @@
 					if (check_productionsites(gametime)) {
 						// if significant change takes place do not go on
 						break;
-					};
+					}
 				}
 			}
 			break;
@@ -413,7 +413,7 @@
 					if (check_mines_(gametime)) {
 						// if significant change takes place do not go on
 						break;
-					};
+					}
 				}
 			}
 			break;
@@ -460,7 +460,7 @@
 					if (get_land_owner(game().map(), coords) == player_number()) {
 						++conquered_wh;
 					}
-				};
+				}
 				if (!basic_economy_established) {
 					assert(!persistent_data->remaining_basic_buildings.empty());
 					log("%2d: Basic economy not achieved, %" PRIuS " building(s) missing, f.e.: %s\n",
@@ -3078,7 +3078,6 @@
 				    (bf->military_in_constr_nearby + bf->military_unstationed) <
 				       concurent_ms_in_constr_no_enemy) {
 					// it will conquer new buildable spots for buildings or mines
-					;
 				} else if (bf->defense_msite_allowed &&
 				           (bf->military_in_constr_nearby + bf->military_unstationed) <
 				              concurent_ms_in_constr_enemy_nearby) {
@@ -3514,15 +3513,15 @@
 	if (!has_building && flag.nr_of_roads() == 1) {
 		return false;
 	} else if (is_warehouse && flag.nr_of_roads() <= 3) {
-		;
+		// Do nothing
 	} else if (needs_warehouse) {
-		;
+		// Do nothing
 	} else if (flag.current_wares() > 5) {
-		;
+		// Do nothing
 	} else if (has_building && std::rand() % 3 == 0) {
-		;
+		// Do nothing
 	} else if (std::rand() % 10 == 0) {
-		;
+		// Do nothing
 	} else {
 		return false;
 	}
@@ -3753,8 +3752,6 @@
 		// if we are within grace time, it is OK, just go on
 		if (eco->dismantle_grace_time > gametime &&
 		    eco->dismantle_grace_time != std::numeric_limits<uint32_t>::max()) {
-			;
-
 			// if grace time is not set, this is probably first time without a warehouse and we must
 			// set it
 		} else if (eco->dismantle_grace_time == std::numeric_limits<uint32_t>::max()) {
@@ -5458,10 +5455,11 @@
 			inputs[14] = (bo.current_stats - 50) / 10;
 			inputs[15] = management_data.get_military_number_at(123) / 10;
 			inputs[16] = 0;
-			inputs[17] = (inputs_on_stock) ? 0 : -2;
+			// TODO(GunChleoc): This is overwritten below due to a typo
+			// inputs[17] = (inputs_on_stock) ? 0 : -2;
 			inputs[18] = (suppliers_exist) ? 0 : -3;
-			;
 			inputs[17] = (inputs_on_stock) ? 0 : -4;
+			// Nothing on inputs[19]
 			inputs[20] =
 			   (mines_per_type[bo.mines].in_construction + mines_per_type[bo.mines].finished == 1) ?
 			      3 :
@@ -6060,7 +6058,7 @@
 		// 2. in new flags to be processed yet
 		if (remove_from_dqueue<Widelands::Flag>(new_flags, flag)) {
 			return;
-		};
+		}
 
 		// 3. Or in neither of them
 	} else if (upcast(Road const, road, &pi)) {
@@ -6152,7 +6150,7 @@
 		// (used when testing possible port location)
 		if (f->nodecaps() & BUILDCAPS_MINE) {
 			mineable_fields_count += 1;
-		};
+		}
 
 		// add neighbours to a queue (duplicates are no problem)
 		// to relieve AI/CPU we skip every second field in each direction
 
=== modified file 'src/ai/defaultai_warfare.cc'
--- src/ai/defaultai_warfare.cc	2019-02-23 11:00:49 +0000
+++ src/ai/defaultai_warfare.cc	2019-04-10 16:40:56 +0000
@@ -266,7 +266,6 @@
 				inputs[3] = (is_warehouse) ? 2 : 0;
 				inputs[4] = (site->second.attack_soldiers_competency > 15) ? 2 : 0;
 				inputs[5] = (site->second.attack_soldiers_competency > 25) ? 4 : 0;
-				;
 				inputs[6] =
 				   (2 * site->second.defenders_strength > 3 * site->second.attack_soldiers_strength) ?
 				      2 :
 
=== modified file 'src/economy/economy.cc'
--- src/economy/economy.cc	2019-02-23 11:00:49 +0000
+++ src/economy/economy.cc	2019-04-10 16:40:56 +0000
@@ -434,9 +434,9 @@
 	RequestList::iterator const it = std::find(requests_.begin(), requests_.end(), &req);
 
 	if (it == requests_.end()) {
-		FORMAT_WARNINGS_OFF;
+		FORMAT_WARNINGS_OFF
 		log("WARNING: remove_request(%p) not in list\n", &req);
-		FORMAT_WARNINGS_ON;
+		FORMAT_WARNINGS_ON
 		return;
 	}
 
 
=== modified file 'src/economy/ware_instance.cc'
--- src/economy/ware_instance.cc	2019-02-23 11:00:49 +0000
+++ src/economy/ware_instance.cc	2019-04-10 16:40:56 +0000
@@ -187,9 +187,9 @@
 
 WareInstance::~WareInstance() {
 	if (supply_) {
-		FORMAT_WARNINGS_OFF;
+		FORMAT_WARNINGS_OFF
 		molog("Ware %u still has supply %p\n", descr_index_, supply_);
-		FORMAT_WARNINGS_ON;
+		FORMAT_WARNINGS_ON
 		delete supply_;
 	}
 }
 
=== modified file 'src/editor/tools/info_tool.cc'
--- src/editor/tools/info_tool.cc	2019-02-23 11:00:49 +0000
+++ src/editor/tools/info_tool.cc	2019-04-10 16:40:56 +0000
@@ -74,7 +74,7 @@
 	} break;
 	default:
 		break;
-	};
+	}
 
 	if (caps & Widelands::BUILDCAPS_FLAG) {
 		/** TRANSLATORS: Editor terrain property: space for a flag */
 
=== modified file 'src/editor/ui_menus/tool_menu.cc'
--- src/editor/ui_menus/tool_menu.cc	2019-02-23 11:00:49 +0000
+++ src/editor/ui_menus/tool_menu.cc	2019-04-10 16:40:56 +0000
@@ -56,15 +56,15 @@
 	   this, pos, g_gr->images().get("images/wui/editor/editor_menu_tool_" pic ".png"), tooltip);   \
 	pos.x += width + spacing;
 
-	ADD_BUTTON("change_height", _("Change height"));
-	ADD_BUTTON("noise_height", _("Random height"));
-	ADD_BUTTON("set_terrain", _("Terrain"));
-	ADD_BUTTON("place_immovable", _("Immovables"));
-	ADD_BUTTON("place_bob", _("Animals"));
-	ADD_BUTTON("change_resources", _("Resources"));
-	ADD_BUTTON("set_port_space", _("Set port space"));
+	ADD_BUTTON("change_height", _("Change height"))
+	ADD_BUTTON("noise_height", _("Random height"))
+	ADD_BUTTON("set_terrain", _("Terrain"))
+	ADD_BUTTON("place_immovable", _("Immovables"))
+	ADD_BUTTON("place_bob", _("Animals"))
+	ADD_BUTTON("change_resources", _("Resources"))
+	ADD_BUTTON("set_port_space", _("Set port space"))
 	ADD_BUTTON("set_origin", _("Set the position that will have the coordinates (0, 0). This will "
-	                           "be the top-left corner of a generated minimap."));
+	                           "be the top-left corner of a generated minimap."))
 
 	set_inner_size(offs.x + (width + spacing) * num_tools, offs.y + (height + spacing));
 
 
=== modified file 'src/graphic/gl/initialize.cc'
--- src/graphic/gl/initialize.cc	2019-02-23 22:42:03 +0000
+++ src/graphic/gl/initialize.cc	2019-04-10 16:40:56 +0000
@@ -101,17 +101,17 @@
 		glbinding::setAfterCallback([](const glbinding::FunctionCall& call) {
 			log("%s(", call.function->name());
 			for (size_t i = 0; i < call.parameters.size(); ++i) {
-				FORMAT_WARNINGS_OFF;
+				FORMAT_WARNINGS_OFF
 				log("%p", call.parameters[i].get());
-				FORMAT_WARNINGS_ON;
+				FORMAT_WARNINGS_ON
 				if (i < call.parameters.size() - 1)
 					log(", ");
 			}
 			log(")");
 			if (call.returnValue) {
-				FORMAT_WARNINGS_OFF;
+				FORMAT_WARNINGS_OFF
 				log(" -> %p", call.returnValue.get());
-				FORMAT_WARNINGS_ON;
+				FORMAT_WARNINGS_ON
 			}
 			const auto error = glGetError();
 			log(" [%s]\n", gl_error_to_string(error));
@@ -151,26 +151,26 @@
 
 	LOG_SDL_GL_ATTRIBUTE(SDL_GL_RED_SIZE)
 	LOG_SDL_GL_ATTRIBUTE(SDL_GL_GREEN_SIZE)
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_BLUE_SIZE);
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_ALPHA_SIZE);
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_BUFFER_SIZE);
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_DOUBLEBUFFER);
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_DEPTH_SIZE);
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_STENCIL_SIZE);
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_ACCUM_RED_SIZE);
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_ACCUM_GREEN_SIZE);
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_ACCUM_BLUE_SIZE);
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_ACCUM_ALPHA_SIZE);
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_STEREO);
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_MULTISAMPLEBUFFERS);
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_MULTISAMPLESAMPLES);
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_ACCELERATED_VISUAL);
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_CONTEXT_MAJOR_VERSION);
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_CONTEXT_MINOR_VERSION);
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_CONTEXT_FLAGS);
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_CONTEXT_PROFILE_MASK);
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_SHARE_WITH_CURRENT_CONTEXT);
-	LOG_SDL_GL_ATTRIBUTE(SDL_GL_FRAMEBUFFER_SRGB_CAPABLE);
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_BLUE_SIZE)
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_ALPHA_SIZE)
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_BUFFER_SIZE)
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_DOUBLEBUFFER)
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_DEPTH_SIZE)
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_STENCIL_SIZE)
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_ACCUM_RED_SIZE)
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_ACCUM_GREEN_SIZE)
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_ACCUM_BLUE_SIZE)
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_ACCUM_ALPHA_SIZE)
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_STEREO)
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_MULTISAMPLEBUFFERS)
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_MULTISAMPLESAMPLES)
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_ACCELERATED_VISUAL)
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_CONTEXT_MAJOR_VERSION)
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_CONTEXT_MINOR_VERSION)
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_CONTEXT_FLAGS)
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_CONTEXT_PROFILE_MASK)
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_SHARE_WITH_CURRENT_CONTEXT)
+	LOG_SDL_GL_ATTRIBUTE(SDL_GL_FRAMEBUFFER_SRGB_CAPABLE)
 #undef LOG_SDL_GL_ATTRIBUTE
 
 	GLboolean glBool;
 
=== modified file 'src/graphic/gl/utils.cc'
--- src/graphic/gl/utils.cc	2017-11-28 17:29:49 +0000
+++ src/graphic/gl/utils.cc	2019-04-10 16:40:56 +0000
@@ -57,7 +57,7 @@
 }  // namespace
 
 const char* gl_error_to_string(const GLenum err) {
-	CLANG_DIAG_OFF("-Wswitch-enum");
+	CLANG_DIAG_OFF("-Wswitch-enum")
 #define LOG(a)                                                                                     \
 	case a:                                                                                         \
 		return #a
@@ -74,7 +74,7 @@
 		break;
 	}
 #undef LOG
-	CLANG_DIAG_ON("-Wswitch-enum");
+	CLANG_DIAG_ON("-Wswitch-enum")
 	return "unknown";
 }
 
 
=== modified file 'src/io/filesystem/test/test_filesystem.cc'
--- src/io/filesystem/test/test_filesystem.cc	2019-02-23 11:00:49 +0000
+++ src/io/filesystem/test/test_filesystem.cc	2019-04-10 16:40:56 +0000
@@ -65,66 +65,66 @@
 
 	// RealFSImpl is constructed with a root directory...
 
-	TEST_CANONICALIZE_NAME("", "path", cwd + "/path");
-	TEST_CANONICALIZE_NAME(".", "path", cwd + "/path");
+	TEST_CANONICALIZE_NAME("", "path", cwd + "/path")
+	TEST_CANONICALIZE_NAME(".", "path", cwd + "/path")
 
-	TEST_CANONICALIZE_NAME("/home", "path", "/home/path");
-	TEST_CANONICALIZE_NAME("/opt", "path", "/opt/path");
-	TEST_CANONICALIZE_NAME("/opt/test", "path", "/opt/test/path");
-	TEST_CANONICALIZE_NAME("/opt", "some/path", "/opt/some/path");
+	TEST_CANONICALIZE_NAME("/home", "path", "/home/path")
+	TEST_CANONICALIZE_NAME("/opt", "path", "/opt/path")
+	TEST_CANONICALIZE_NAME("/opt/test", "path", "/opt/test/path")
+	TEST_CANONICALIZE_NAME("/opt", "some/path", "/opt/some/path")
 
 	// single dot is removed (root path)...
 
-	TEST_CANONICALIZE_NAME("./home/me", "path", cwd + "/home/me/path");
-	TEST_CANONICALIZE_NAME("/home/./you", "path", "/home/you/path");
-	TEST_CANONICALIZE_NAME("/home/us/.", "path", "/home/us/path");
+	TEST_CANONICALIZE_NAME("./home/me", "path", cwd + "/home/me/path")
+	TEST_CANONICALIZE_NAME("/home/./you", "path", "/home/you/path")
+	TEST_CANONICALIZE_NAME("/home/us/.", "path", "/home/us/path")
 
 	// single dot is removed (file path)...
 
-	TEST_CANONICALIZE_NAME("/opt", "./no/where", "/opt/no/where");
-	TEST_CANONICALIZE_NAME("/opt", "some/./where", "/opt/some/where");
-	TEST_CANONICALIZE_NAME("/opt", "any/where/.", "/opt/any/where");
+	TEST_CANONICALIZE_NAME("/opt", "./no/where", "/opt/no/where")
+	TEST_CANONICALIZE_NAME("/opt", "some/./where", "/opt/some/where")
+	TEST_CANONICALIZE_NAME("/opt", "any/where/.", "/opt/any/where")
 
 	// empty path nodes are removed (root path)...
 
-	TEST_CANONICALIZE_NAME("//usr/empty", "path", "/usr/empty/path");
-	TEST_CANONICALIZE_NAME("/usr//empty", "path", "/usr/empty/path");
-	TEST_CANONICALIZE_NAME("/usr/empty/", "path", "/usr/empty/path");
-	TEST_CANONICALIZE_NAME("/usr/empty//", "path", "/usr/empty/path");
+	TEST_CANONICALIZE_NAME("//usr/empty", "path", "/usr/empty/path")
+	TEST_CANONICALIZE_NAME("/usr//empty", "path", "/usr/empty/path")
+	TEST_CANONICALIZE_NAME("/usr/empty/", "path", "/usr/empty/path")
+	TEST_CANONICALIZE_NAME("/usr/empty//", "path", "/usr/empty/path")
 
 	// empty path nodes are removed (file path)...
 
-	TEST_CANONICALIZE_NAME("/usr", "/empty/path", "/usr/empty/path");
-	TEST_CANONICALIZE_NAME("/usr", "//empty/path", "/usr/empty/path");
-	TEST_CANONICALIZE_NAME("/usr", "empty//path", "/usr/empty/path");
-	TEST_CANONICALIZE_NAME("/usr", "empty/path/", "/usr/empty/path");
-	TEST_CANONICALIZE_NAME("/usr", "empty/path//", "/usr/empty/path");
+	TEST_CANONICALIZE_NAME("/usr", "/empty/path", "/usr/empty/path")
+	TEST_CANONICALIZE_NAME("/usr", "//empty/path", "/usr/empty/path")
+	TEST_CANONICALIZE_NAME("/usr", "empty//path", "/usr/empty/path")
+	TEST_CANONICALIZE_NAME("/usr", "empty/path/", "/usr/empty/path")
+	TEST_CANONICALIZE_NAME("/usr", "empty/path//", "/usr/empty/path")
 
 	// '..' moves up a directory in the path (root path)...
 
-	TEST_CANONICALIZE_NAME("/usr/../home", "path", "/home/path");
-	TEST_CANONICALIZE_NAME("/usr/../../home", "path", "/home/path");
-	TEST_CANONICALIZE_NAME("/usr/test/..", "path", "/usr/path");
-	TEST_CANONICALIZE_NAME("/usr/one/../two/..", "path", "/usr/path");
-	TEST_CANONICALIZE_NAME("/usr/one/../a/b/..", "path", "/usr/a/path");
+	TEST_CANONICALIZE_NAME("/usr/../home", "path", "/home/path")
+	TEST_CANONICALIZE_NAME("/usr/../../home", "path", "/home/path")
+	TEST_CANONICALIZE_NAME("/usr/test/..", "path", "/usr/path")
+	TEST_CANONICALIZE_NAME("/usr/one/../two/..", "path", "/usr/path")
+	TEST_CANONICALIZE_NAME("/usr/one/../a/b/..", "path", "/usr/a/path")
 
 	// '..' moves up a directory in the path (file path)...
 
-	TEST_CANONICALIZE_NAME("/home/test", "../path", "/home/path");
-	TEST_CANONICALIZE_NAME("/home/test", "../../path", "/path");
-	TEST_CANONICALIZE_NAME("/home/test", "../../../path", "/path");
-
-	TEST_CANONICALIZE_NAME("/home/test", "path/..", "/home/test");
-	TEST_CANONICALIZE_NAME("/home/test", "path/../..", "/home");
-
-	TEST_CANONICALIZE_NAME("/home/test", "path/../one", "/home/test/one");
-	TEST_CANONICALIZE_NAME("/home/test", "path/../../one", "/home/one");
-	TEST_CANONICALIZE_NAME("/home/test", "path/../../../one", "/one");
-	TEST_CANONICALIZE_NAME("/home/test", "path/../../../../one", "/one");
+	TEST_CANONICALIZE_NAME("/home/test", "../path", "/home/path")
+	TEST_CANONICALIZE_NAME("/home/test", "../../path", "/path")
+	TEST_CANONICALIZE_NAME("/home/test", "../../../path", "/path")
+
+	TEST_CANONICALIZE_NAME("/home/test", "path/..", "/home/test")
+	TEST_CANONICALIZE_NAME("/home/test", "path/../..", "/home")
+
+	TEST_CANONICALIZE_NAME("/home/test", "path/../one", "/home/test/one")
+	TEST_CANONICALIZE_NAME("/home/test", "path/../../one", "/home/one")
+	TEST_CANONICALIZE_NAME("/home/test", "path/../../../one", "/one")
+	TEST_CANONICALIZE_NAME("/home/test", "path/../../../../one", "/one")
 
 	// ...but not a '..' coming from two different strings...
 
-	TEST_CANONICALIZE_NAME("/home/test/.", "./path", "/home/test/path");
+	TEST_CANONICALIZE_NAME("/home/test/.", "./path", "/home/test/path")
 
 #ifdef _WIN32
 	// Check drive letter handling.
@@ -140,53 +140,53 @@
 	setenv("HOME", "/my/home", 1);
 	std::string cwd = RealFSImpl("").get_working_directory();
 
-	TEST_CANONICALIZE_NAME("~", "path", "/my/home/path");
-	TEST_CANONICALIZE_NAME("~/test", "path", "/my/home/test/path");
+	TEST_CANONICALIZE_NAME("~", "path", "/my/home/path")
+	TEST_CANONICALIZE_NAME("~/test", "path", "/my/home/test/path")
 
 	setenv("HOME", "/somewhere", 1);
-	TEST_CANONICALIZE_NAME("~", "path", "/somewhere/path");
+	TEST_CANONICALIZE_NAME("~", "path", "/somewhere/path")
 
 	// ~ at the start of the path overrides the root
 
-	TEST_CANONICALIZE_NAME("~", "~", "/somewhere");
-	TEST_CANONICALIZE_NAME("~/vanish", "~", "/somewhere");
-	TEST_CANONICALIZE_NAME("~/fs", "~/sf", "/somewhere/sf");
+	TEST_CANONICALIZE_NAME("~", "~", "/somewhere")
+	TEST_CANONICALIZE_NAME("~/vanish", "~", "/somewhere")
+	TEST_CANONICALIZE_NAME("~/fs", "~/sf", "/somewhere/sf")
 
 	// ~ anywhere other than at the start of a path does not get expanded
 
-	TEST_CANONICALIZE_NAME("/opt/~", "path", "/opt/~/path");
-	TEST_CANONICALIZE_NAME("/opt/~/the", "path", "/opt/~/the/path");
+	TEST_CANONICALIZE_NAME("/opt/~", "path", "/opt/~/path")
+	TEST_CANONICALIZE_NAME("/opt/~/the", "path", "/opt/~/the/path")
 
-	TEST_CANONICALIZE_NAME("/opt", "path/~", "/opt/path/~");
-	TEST_CANONICALIZE_NAME("/opt", "path/~/here", "/opt/path/~/here");
+	TEST_CANONICALIZE_NAME("/opt", "path/~", "/opt/path/~")
+	TEST_CANONICALIZE_NAME("/opt", "path/~/here", "/opt/path/~/here")
 
 	// ~ as part of a root-path spec segment name does not get expanded
 
-	TEST_CANONICALIZE_NAME("~a", "path", cwd + "/~a/path");
-	TEST_CANONICALIZE_NAME("a~", "path", cwd + "/a~/path");
-
-	TEST_CANONICALIZE_NAME("/opt/~a", "path", "/opt/~a/path");
-	TEST_CANONICALIZE_NAME("/opt/a~", "path", "/opt/a~/path");
-
-	TEST_CANONICALIZE_NAME("~a/b", "path", cwd + "/~a/b/path");
-	TEST_CANONICALIZE_NAME("a~/b", "path", cwd + "/a~/b/path");
-
-	TEST_CANONICALIZE_NAME("/opt/~the/test", "path", "/opt/~the/test/path");
-	TEST_CANONICALIZE_NAME("/opt/the~/test", "path", "/opt/the~/test/path");
+	TEST_CANONICALIZE_NAME("~a", "path", cwd + "/~a/path")
+	TEST_CANONICALIZE_NAME("a~", "path", cwd + "/a~/path")
+
+	TEST_CANONICALIZE_NAME("/opt/~a", "path", "/opt/~a/path")
+	TEST_CANONICALIZE_NAME("/opt/a~", "path", "/opt/a~/path")
+
+	TEST_CANONICALIZE_NAME("~a/b", "path", cwd + "/~a/b/path")
+	TEST_CANONICALIZE_NAME("a~/b", "path", cwd + "/a~/b/path")
+
+	TEST_CANONICALIZE_NAME("/opt/~the/test", "path", "/opt/~the/test/path")
+	TEST_CANONICALIZE_NAME("/opt/the~/test", "path", "/opt/the~/test/path")
 
 	// ~ as part of a path spec segment name does not get expanded
 
-	TEST_CANONICALIZE_NAME("/opt", "~path", "/opt/~path");
-	TEST_CANONICALIZE_NAME("/opt", "path~", "/opt/path~");
-
-	TEST_CANONICALIZE_NAME("/opt", "some/~path", "/opt/some/~path");
-	TEST_CANONICALIZE_NAME("/opt", "some/path~", "/opt/some/path~");
-
-	TEST_CANONICALIZE_NAME("/opt", "~path/here", "/opt/~path/here");
-	TEST_CANONICALIZE_NAME("/opt", "path~/here", "/opt/path~/here");
-
-	TEST_CANONICALIZE_NAME("/opt", "a/~path/here", "/opt/a/~path/here");
-	TEST_CANONICALIZE_NAME("/opt", "a/path~/here", "/opt/a/path~/here");
+	TEST_CANONICALIZE_NAME("/opt", "~path", "/opt/~path")
+	TEST_CANONICALIZE_NAME("/opt", "path~", "/opt/path~")
+
+	TEST_CANONICALIZE_NAME("/opt", "some/~path", "/opt/some/~path")
+	TEST_CANONICALIZE_NAME("/opt", "some/path~", "/opt/some/path~")
+
+	TEST_CANONICALIZE_NAME("/opt", "~path/here", "/opt/~path/here")
+	TEST_CANONICALIZE_NAME("/opt", "path~/here", "/opt/path~/here")
+
+	TEST_CANONICALIZE_NAME("/opt", "a/~path/here", "/opt/a/~path/here")
+	TEST_CANONICALIZE_NAME("/opt", "a/path~/here", "/opt/a/path~/here")
 }
 #endif
 BOOST_AUTO_TEST_SUITE_END()
 
=== modified file 'src/logic/map_objects/bob.cc'
--- src/logic/map_objects/bob.cc	2019-02-27 17:19:00 +0000
+++ src/logic/map_objects/bob.cc	2019-04-10 16:40:56 +0000
@@ -903,9 +903,9 @@
 
 /// Give debug information.
 void Bob::log_general_info(const EditorGameBase& egbase) const {
-	FORMAT_WARNINGS_OFF;
+	FORMAT_WARNINGS_OFF
 	molog("Owner: %p\n", owner_);
-	FORMAT_WARNINGS_ON;
+	FORMAT_WARNINGS_ON
 	molog("Postition: (%i, %i)\n", position_.x, position_.y);
 	molog("ActID: %i\n", actid_);
 	molog("ActScheduled: %s\n", actscheduled_ ? "true" : "false");
@@ -929,9 +929,9 @@
 		molog("* ivar2: %i\n", stack_[i].ivar2);
 		molog("* ivar3: %i\n", stack_[i].ivar3);
 
-		FORMAT_WARNINGS_OFF;
+		FORMAT_WARNINGS_OFF
 		molog("* object pointer: %p\n", stack_[i].objvar1.get(egbase));
-		FORMAT_WARNINGS_ON;
+		FORMAT_WARNINGS_ON
 		molog("* svar1: %s\n", stack_[i].svar1.c_str());
 
 		molog("* coords: (%i, %i)\n", stack_[i].coords.x, stack_[i].coords.y);
@@ -939,9 +939,9 @@
 		for (Direction dir = FIRST_DIRECTION; dir <= LAST_DIRECTION; ++dir) {
 			molog(" %d", stack_[i].diranims.get_animation(dir));
 		}
-		FORMAT_WARNINGS_OFF;
+		FORMAT_WARNINGS_OFF
 		molog("\n* path: %p\n", stack_[i].path);
-		FORMAT_WARNINGS_ON;
+		FORMAT_WARNINGS_ON
 		if (stack_[i].path) {
 			const Path& path = *stack_[i].path;
 			molog("** Path length: %" PRIuS "\n", path.get_nsteps());
@@ -953,10 +953,10 @@
 				molog("*  (%i, %i)\n", coords.x, coords.y);
 			}
 		}
-		FORMAT_WARNINGS_OFF;
+		FORMAT_WARNINGS_OFF
 		molog("* route: %p\n", stack_[i].route);
 		molog("* program: %p\n", stack_[i].route);
-		FORMAT_WARNINGS_ON;
+		FORMAT_WARNINGS_ON
 	}
 }
 
 
=== modified file 'src/logic/map_objects/immovable.cc'
--- src/logic/map_objects/immovable.cc	2019-02-27 17:19:00 +0000
+++ src/logic/map_objects/immovable.cc	2019-04-10 16:40:56 +0000
@@ -1337,14 +1337,14 @@
 void PlayerImmovable::log_general_info(const EditorGameBase& egbase) const {
 	BaseImmovable::log_general_info(egbase);
 
-	FORMAT_WARNINGS_OFF;
+	FORMAT_WARNINGS_OFF
 	molog("this: %p\n", this);
 	molog("owner_: %p\n", owner_);
-	FORMAT_WARNINGS_ON;
+	FORMAT_WARNINGS_ON
 	molog("player_number: %i\n", owner_->player_number());
-	FORMAT_WARNINGS_OFF;
+	FORMAT_WARNINGS_OFF
 	molog("economy_: %p\n", economy_);
-	FORMAT_WARNINGS_ON;
+	FORMAT_WARNINGS_ON
 }
 
 constexpr uint8_t kCurrentPacketVersionPlayerImmovable = 1;
 
=== modified file 'src/logic/map_objects/tribes/building.cc'
--- src/logic/map_objects/tribes/building.cc	2019-02-28 12:22:36 +0000
+++ src/logic/map_objects/tribes/building.cc	2019-04-10 16:40:56 +0000
@@ -681,9 +681,9 @@
 	PlayerImmovable::log_general_info(egbase);
 
 	molog("position: (%i, %i)\n", position_.x, position_.y);
-	FORMAT_WARNINGS_OFF;
+	FORMAT_WARNINGS_OFF
 	molog("flag: %p\n", flag_);
-	FORMAT_WARNINGS_ON;
+	FORMAT_WARNINGS_ON
 	molog("* position: (%i, %i)\n", flag_->get_position().x, flag_->get_position().y);
 
 	molog("anim: %s\n", descr().get_animation_name(anim_).c_str());
@@ -692,9 +692,9 @@
 	molog("leave_time: %i\n", leave_time_);
 
 	molog("leave_queue.size(): %" PRIuS "\n", leave_queue_.size());
-	FORMAT_WARNINGS_OFF;
+	FORMAT_WARNINGS_OFF
 	molog("leave_allow.get(): %p\n", leave_allow_.get(egbase));
-	FORMAT_WARNINGS_ON;
+	FORMAT_WARNINGS_ON
 }
 
 void Building::add_worker(Worker& worker) {
 
=== modified file 'src/logic/map_objects/tribes/production_program.cc'
--- src/logic/map_objects/tribes/production_program.cc	2019-02-23 11:00:49 +0000
+++ src/logic/map_objects/tribes/production_program.cc	2019-04-10 16:40:56 +0000
@@ -133,7 +133,7 @@
 				char const* const type_name = next_word(parameters, reached_end);
 				const DescriptionIndex& wareindex = tribes.ware_index(type_name);
 				if (tribes.ware_exists(wareindex)) {
-					for (int i = 0; i < static_cast<int>(tribes.nrtribes()); ++i) {
+					for (size_t i = 0; i < tribes.nrtribes(); ++i) {
 						const TribeDescr& tribe_descr = *tribes.get_tribe_descr(i);
 						if (tribe_descr.has_ware(wareindex)) {
 							tribes.set_ware_type_has_demand_check(wareindex, tribe_descr.name());
@@ -142,7 +142,7 @@
 					return new ProductionProgram::ActReturn::EconomyNeedsWare(wareindex);
 				} else if (tribes.worker_exists(tribes.worker_index(type_name))) {
 					const DescriptionIndex& workerindex = tribes.worker_index(type_name);
-					for (int i = 0; i < static_cast<int>(tribes.nrtribes()); ++i) {
+					for (size_t i = 0; i < tribes.nrtribes(); ++i) {
 						const TribeDescr* tribe_descr = tribes.get_tribe_descr(i);
 						if (tribe_descr->has_worker(workerindex)) {
 							tribes.set_worker_type_has_demand_check(workerindex);
@@ -462,13 +462,13 @@
                                         const Tribes& tribes) {
 	try {
 		if (match(parameters, "failed"))
-			result_ = Failed;
+			result_ = ProgramResult::kFailed;
 		else if (match(parameters, "completed"))
-			result_ = Completed;
+			result_ = ProgramResult::kCompleted;
 		else if (match(parameters, "skipped"))
-			result_ = Skipped;
+			result_ = ProgramResult::kSkipped;
 		else if (match(parameters, "no_stats"))
-			result_ = None;
+			result_ = ProgramResult::kNone;
 		else
 			throw GameDataError("expected %s but found \"%s\"",
 			                    "{\"failed\"|\"completed\"|\"skipped\"|\"no_stats\"}", parameters);
@@ -539,22 +539,33 @@
 		   i18n::localize_list(condition_list, i18n::ConcatenateWith::AND);
 
 		std::string result_string;
-		if (result_ == Failed) {
+		switch (result_) {
+		case ProgramResult::kFailed: {
 			/** TRANSLATORS: "Did not start working because the economy needs the ware ‘%s’" */
 			result_string = (boost::format(_("Did not start %1$s because %2$s")) %
 			                 ps.top_state().program->descname() % condition_string)
 			                   .str();
-		} else if (result_ == Completed) {
+		} break;
+		case ProgramResult::kCompleted: {
 			/** TRANSLATORS: "Completed working because the economy needs the ware ‘%s’" */
 			result_string = (boost::format(_("Completed %1$s because %2$s")) %
 			                 ps.top_state().program->descname() % condition_string)
 			                   .str();
-		} else {
+		} break;
+		case ProgramResult::kSkipped: {
 			/** TRANSLATORS: "Skipped working because the economy needs the ware ‘%s’" */
 			result_string = (boost::format(_("Skipped %1$s because %2$s")) %
 			                 ps.top_state().program->descname() % condition_string)
 			                   .str();
-		}
+		} break;
+		case ProgramResult::kNone: {
+			// TODO(GunChleoc): Same as skipped - is this on purpose?
+			result_string = (boost::format(_("Skipped %1$s because %2$s")) %
+			                 ps.top_state().program->descname() % condition_string)
+			                   .str();
+		}
+		}
+
 		ps.set_production_result(result_string);
 	}
 	return ps.program_end(game, result_);
@@ -562,9 +573,9 @@
 
 ProductionProgram::ActCall::ActCall(char* parameters, const ProductionSiteDescr& descr) {
 	//  Initialize with default handling methods.
-	handling_methods_[Failed - 1] = Continue;
-	handling_methods_[Completed - 1] = Continue;
-	handling_methods_[Skipped - 1] = Continue;
+	handling_methods_[program_result_index(ProgramResult::kFailed)] = ProgramResultHandlingMethod::kContinue;
+	handling_methods_[program_result_index(ProgramResult::kCompleted)] = ProgramResultHandlingMethod::kContinue;
+	handling_methods_[program_result_index(ProgramResult::kSkipped)] = ProgramResultHandlingMethod::kContinue;
 
 	try {
 		bool reached_end;
@@ -586,34 +597,34 @@
 
 			ProgramResult result_to_set_method_for;
 			if (match_force_skip(parameters, "failure")) {
-				if (handling_methods_[Failed - 1] != Continue)
+				if (handling_methods_[program_result_index(ProgramResult::kFailed)] != ProgramResultHandlingMethod::kContinue)
 					throw GameDataError("%s handling method already defined", "failure");
-				result_to_set_method_for = Failed;
+				result_to_set_method_for = ProgramResult::kFailed;
 			} else if (match_force_skip(parameters, "completion")) {
-				if (handling_methods_[Completed - 1] != Continue)
+				if (handling_methods_[program_result_index(ProgramResult::kCompleted)] != ProgramResultHandlingMethod::kContinue)
 					throw GameDataError("%s handling method already defined", "completion");
-				result_to_set_method_for = Completed;
+				result_to_set_method_for = ProgramResult::kCompleted;
 			} else if (match_force_skip(parameters, "skip")) {
-				if (handling_methods_[Skipped - 1] != Continue)
+				if (handling_methods_[program_result_index(ProgramResult::kSkipped)] != ProgramResultHandlingMethod::kContinue)
 					throw GameDataError("%s handling method already defined", "skip");
-				result_to_set_method_for = Skipped;
+				result_to_set_method_for = ProgramResult::kSkipped;
 			} else
 				throw GameDataError(
 				   "expected %s but found \"%s\"", "{\"failure\"|\"completion\"|\"skip\"}", parameters);
 
 			ProgramResultHandlingMethod handling_method;
 			if (match(parameters, "fail"))
-				handling_method = Fail;
+				handling_method = ProgramResultHandlingMethod::kFail;
 			else if (match(parameters, "complete"))
-				handling_method = Complete;
+				handling_method = ProgramResultHandlingMethod::kComplete;
 			else if (match(parameters, "skip"))
-				handling_method = Skip;
+				handling_method = ProgramResultHandlingMethod::kSkip;
 			else if (match(parameters, "repeat"))
-				handling_method = Repeat;
+				handling_method = ProgramResultHandlingMethod::kRepeat;
 			else
 				throw GameDataError("expected %s but found \"%s\"",
 				                    "{\"fail\"|\"complete\"|\"skip\"|\"repeat\"}", parameters);
-			handling_methods_[result_to_set_method_for - 1] = handling_method;
+			handling_methods_[program_result_index(result_to_set_method_for)] = handling_method;
 			reached_end = !*parameters;
 		}
 	} catch (const WException& e) {
@@ -622,21 +633,21 @@
 }
 
 void ProductionProgram::ActCall::execute(Game& game, ProductionSite& ps) const {
-	ProgramResult const program_result = static_cast<ProgramResult>(ps.top_state().phase);
+	ProgramResult const program_result = ps.top_state().phase;
 
-	if (program_result == None) {  //  The program has not yet been called.
+	if (program_result == ProgramResult::kNone) {  //  The program has not yet been called.
 		return ps.program_start(game, program_->name());
 	}
 
-	switch (handling_methods_[program_result - 1]) {
-	case Fail:
-	case Complete:
-	case Skip:
-		return ps.program_end(game, None);
-	case Continue:
+	switch (handling_methods_[program_result_index(program_result)]) {
+	case ProgramResultHandlingMethod::kFail:
+	case ProgramResultHandlingMethod::kComplete:
+	case ProgramResultHandlingMethod::kSkip:
+		return ps.program_end(game, ProgramResult::kNone);
+	case ProgramResultHandlingMethod::kContinue:
 		return ps.program_step(game);
-	case Repeat:
-		ps.top_state().phase = None;
+	case ProgramResultHandlingMethod::kRepeat:
+		ps.top_state().phase = ProgramResult::kNone;
 		ps.program_timer_ = true;
 		ps.program_time_ = ps.schedule_act(game, 10);
 		break;
@@ -687,9 +698,9 @@
                                                          ProductionSite& psite,
                                                          Worker& worker) const {
 	ProductionSite::State& state = psite.top_state();
-	if (state.phase == 0) {
+	if (state.phase == ProgramResult::kNone) {
 		worker.start_task_program(game, program());
-		++state.phase;
+		state.phase = ProgramResult::kFailed;
 		return true;
 	} else {
 		psite.program_step(game);
@@ -700,7 +711,7 @@
 void ProductionProgram::ActCallWorker::building_work_failed(Game& game,
                                                             ProductionSite& psite,
                                                             Worker&) const {
-	psite.program_end(game, Failed);
+	psite.program_end(game, ProgramResult::kFailed);
 }
 
 ProductionProgram::ActSleep::ActSleep(char* parameters) {
@@ -719,7 +730,7 @@
 }
 
 void ProductionProgram::ActSleep::execute(Game& game, ProductionSite& ps) const {
-	return ps.program_step(game, duration_ ? duration_ : ps.top_state().phase);
+	return ps.program_step(game, duration_ ? duration_ : 0, ps.top_state().phase);
 }
 
 ProductionProgram::ActCheckMap::ActCheckMap(char* parameters) {
@@ -743,7 +754,7 @@
 			return ps.program_step(game, 0);
 		} else {
 			ps.set_production_result(_("No use for ships on this map!"));
-			return ps.program_end(game, Failed);
+			return ps.program_end(game, ProgramResult::kFailed);
 		}
 	}
 	default:
@@ -777,7 +788,7 @@
 
 void ProductionProgram::ActAnimate::execute(Game& game, ProductionSite& ps) const {
 	ps.start_animation(game, id_);
-	return ps.program_step(game, duration_ ? duration_ : ps.top_state().phase);
+	return ps.program_step(game, duration_ ? duration_ : 0, ps.top_state().phase);
 }
 
 ProductionProgram::ActConsume::ActConsume(char* parameters,
@@ -900,7 +911,7 @@
 		      .str();
 
 		ps.set_production_result(result_string);
-		return ps.program_end(game, Failed);
+		return ps.program_end(game, ProgramResult::kFailed);
 	} else {  //  we fulfilled all consumption requirements
 		for (size_t i = 0; i < inputqueues.size(); ++i) {
 			if (uint8_t const q = consumption_quantities[i]) {
@@ -1182,7 +1193,7 @@
 	if (digged_percentage < max_) {
 		//  mine can produce normally
 		if (totalres == 0)
-			return ps.program_end(game, Failed);
+			return ps.program_end(game, ProgramResult::kFailed);
 
 		//  second pass through nodes
 		assert(totalchance);
@@ -1210,7 +1221,7 @@
 		}
 
 		if (pick >= 0) {
-			return ps.program_end(game, Failed);
+			return ps.program_end(game, ProgramResult::kFailed);
 		}
 
 	} else {
@@ -1233,7 +1244,7 @@
 			if (training_ >= game.logic_rand() % 100) {
 				ps.train_workers(game);
 			}
-			return ps.program_end(game, Failed);
+			return ps.program_end(game, ProgramResult::kFailed);
 		}
 	}
 
@@ -1278,7 +1289,7 @@
 	const std::vector<Soldier*> soldiers = ctrl->present_soldiers();
 	if (soldiers.empty()) {
 		ps.set_production_result(_("No soldier to train!"));
-		return ps.program_end(game, Skipped);
+		return ps.program_end(game, ProgramResult::kSkipped);
 	}
 	ps.molog("  Checking soldier (%u) level %d)\n", static_cast<unsigned int>(attribute),
 	         static_cast<unsigned int>(level));
@@ -1287,7 +1298,7 @@
 	for (std::vector<Soldier*>::const_iterator it = soldiers.begin();; ++it) {
 		if (it == soldiers_end) {
 			ps.set_production_result(_("No soldier found for this training level!"));
-			return ps.program_end(game, Skipped);
+			return ps.program_end(game, ProgramResult::kSkipped);
 		}
 		if (attribute == TrainingAttribute::kHealth) {
 			if ((*it)->get_health_level() == level)
@@ -1354,7 +1365,6 @@
 
 void ProductionProgram::ActTrain::execute(Game& game, ProductionSite& ps) const {
 	const SoldierControl* ctrl = ps.soldier_control();
-	;
 	const std::vector<Soldier*> soldiers = ctrl->present_soldiers();
 	const std::vector<Soldier*>::const_iterator soldiers_end = soldiers.end();
 	std::vector<Soldier*>::const_iterator it = soldiers.begin();
@@ -1365,7 +1375,7 @@
 	for (;; ++it) {
 		if (it == soldiers_end) {
 			ps.set_production_result(_("No soldier found for this training level!"));
-			return ps.program_end(game, Skipped);
+			return ps.program_end(game, ProgramResult::kSkipped);
 		}
 		if (attribute == TrainingAttribute::kHealth) {
 			if ((*it)->get_health_level() == level)
@@ -1481,7 +1491,7 @@
 	}
 
 	if (available_resource == INVALID_INDEX) {
-		psite.program_end(game, Failed);
+		psite.program_end(game, ProgramResult::kFailed);
 		return;
 	}
 
@@ -1534,14 +1544,14 @@
 	}
 
 	psite.molog("construct: no object or buildable field\n");
-	psite.program_end(game, Failed);
+	psite.program_end(game, ProgramResult::kFailed);
 }
 
 bool ProductionProgram::ActConstruct::get_building_work(Game& game,
                                                         ProductionSite& psite,
                                                         Worker& worker) const {
 	ProductionSite::State& state = psite.top_state();
-	if (state.phase >= 1) {
+	if (state.phase > ProgramResult::kNone) {
 		psite.program_step(game);
 		return false;
 	}
@@ -1554,7 +1564,7 @@
 	if (construction) {
 		if (!construction->construct_remaining_buildcost(game, &remaining)) {
 			psite.molog("construct: immovable %u not under construction", construction->serial());
-			psite.program_end(game, Failed);
+			psite.program_end(game, ProgramResult::kFailed);
 			return false;
 		}
 	} else {
@@ -1571,7 +1581,7 @@
 	}
 
 	if (!wq) {
-		psite.program_end(game, Failed);
+		psite.program_end(game, ProgramResult::kFailed);
 		return false;
 	}
 
@@ -1587,14 +1597,14 @@
 	worker.top_state().objvar1 = construction;
 	worker.top_state().coords = state.coord;
 
-	state.phase = 1;
+	state.phase = ProgramResult::kFailed;
 	return true;
 }
 
 void ProductionProgram::ActConstruct::building_work_failed(Game& game,
                                                            ProductionSite& psite,
                                                            Worker&) const {
-	psite.program_end(game, Failed);
+	psite.program_end(game, ProgramResult::kFailed);
 }
 
 ProductionProgram::ProductionProgram(const std::string& init_name,
 
=== modified file 'src/logic/map_objects/tribes/productionsite.cc'
--- src/logic/map_objects/tribes/productionsite.cc	2019-02-23 11:00:49 +0000
+++ src/logic/map_objects/tribes/productionsite.cc	2019-04-10 16:40:56 +0000
@@ -682,7 +682,7 @@
 
 		if (!can_start_working()) {
 			while (!stack_.empty())
-				program_end(game, Failed);
+				program_end(game, ProgramResult::kFailed);
 		} else {
 			if (stack_.empty()) {
 				working_positions_[0].worker->update_task_buildingwork(game);
@@ -691,7 +691,7 @@
 
 			State& state = top_state();
 			if (state.program->size() <= state.ip)
-				return program_end(game, Completed);
+				return program_end(game, ProgramResult::kCompleted);
 
 			if (anim_ != descr().get_animation(default_anim_)) {
 				// Restart idle animation, which is the default
@@ -720,7 +720,7 @@
 	// new productions cycle. Otherwise it can lead to consumption
 	// of input wares without producing anything
 	if (is_stopped_ && state.ip == 0) {
-		program_end(game, Failed);
+		program_end(game, ProgramResult::kFailed);
 		program_timer_ = true;
 		program_time_ = schedule_act(game, 20000);
 	} else
@@ -874,7 +874,7 @@
 /**
  * Advance the program to the next step.
  */
-void ProductionSite::program_step(Game& game, uint32_t const delay, uint32_t const phase) {
+void ProductionSite::program_step(Game& game, uint32_t const delay, ProgramResult const phase) {
 	State& state = top_state();
 	++state.ip;
 	state.phase = phase;
@@ -890,7 +890,7 @@
 
 	state.program = descr().get_program(program_name);
 	state.ip = 0;
-	state.phase = 0;
+	state.phase = ProgramResult::kNone;
 
 	stack_.push_back(state);
 
@@ -918,17 +918,18 @@
 	const std::string& program_name = top_state().program->name();
 
 	stack_.pop_back();
-	if (!stack_.empty())
+	if (!stack_.empty()) {
 		top_state().phase = result;
+	}
 
 	switch (result) {
-	case Failed:
+	case ProgramResult::kFailed:
 		statistics_.erase(statistics_.begin(), statistics_.begin() + 1);
 		statistics_.push_back(false);
 		calc_statistics();
 		crude_percent_ = crude_percent_ * 8 / 10;
 		break;
-	case Completed:
+	case ProgramResult::kCompleted:
 		skipped_programs_.erase(program_name);
 		statistics_.erase(statistics_.begin(), statistics_.begin() + 1);
 		statistics_.push_back(true);
@@ -936,11 +937,11 @@
 		crude_percent_ = crude_percent_ * 8 / 10 + 1000000 * 2 / 10;
 		calc_statistics();
 		break;
-	case Skipped:
+	case ProgramResult::kSkipped:
 		skipped_programs_[program_name] = game.get_gametime();
 		crude_percent_ = crude_percent_ * 98 / 100;
 		break;
-	case None:
+	case ProgramResult::kNone:
 		skipped_programs_.erase(program_name);
 		break;
 	}
 
=== modified file 'src/logic/map_objects/tribes/productionsite.h'
--- src/logic/map_objects/tribes/productionsite.h	2019-02-23 11:00:49 +0000
+++ src/logic/map_objects/tribes/productionsite.h	2019-04-10 16:40:56 +0000
@@ -243,7 +243,7 @@
 	struct State {
 		const ProductionProgram* program;  ///< currently running program
 		size_t ip;                         ///< instruction pointer
-		uint32_t phase;                    ///< micro-step index (instruction dependent)
+		ProgramResult phase;                    ///< micro-step index (instruction dependent)
 		uint32_t flags;                    ///< pfXXX flags
 
 		/**
@@ -254,7 +254,7 @@
 		Coords coord;
 		/*@}*/
 
-		State() : program(nullptr), ip(0), phase(0), flags(0), coord(Coords::null()) {
+		State() : program(nullptr), ip(0), phase(ProgramResult::kNone), flags(0), coord(Coords::null()) {
 		}
 	};
 
@@ -282,7 +282,7 @@
 	/// how long it should take to mine, given the particular circumstances,
 	/// and pass the result to the following animation command, to set the
 	/// duration.
-	void program_step(Game&, uint32_t delay = 10, uint32_t phase = 0);
+	void program_step(Game&, uint32_t delay = 10, ProgramResult phase = ProgramResult::kNone);
 
 	void program_start(Game&, const std::string& program_name);
 	virtual void program_end(Game&, ProgramResult);
 
=== modified file 'src/logic/map_objects/tribes/program_result.h'
--- src/logic/map_objects/tribes/program_result.h	2019-02-23 11:00:49 +0000
+++ src/logic/map_objects/tribes/program_result.h	2019-04-10 16:40:56 +0000
@@ -20,10 +20,26 @@
 #ifndef WL_LOGIC_MAP_OBJECTS_TRIBES_PROGRAM_RESULT_H
 #define WL_LOGIC_MAP_OBJECTS_TRIBES_PROGRAM_RESULT_H
 
+#include "base/macros.h"
+
 namespace Widelands {
-// Don't change this values, they are used as hardcoded array indices
-enum ProgramResult { None = 0, Failed = 1, Completed = 2, Skipped = 3 };
-enum ProgramResultHandlingMethod { Fail, Complete, Skip, Continue, Repeat };
+// Don't change these values, they are used as hardcoded array indices
+enum class ProgramResult { kNone = 0, kFailed = 1, kCompleted = 2, kSkipped = 3 };
+inline int program_result_index(ProgramResult result) {
+	switch (result) {
+	case ProgramResult::kFailed:
+		return 0;
+	case ProgramResult::kCompleted:
+		return 1;
+	case ProgramResult::kSkipped:
+		return 2;
+	case ProgramResult::kNone:
+		NEVER_HERE();
+	}
+	return 0;
+}
+
+enum class ProgramResultHandlingMethod { kFail, kComplete, kSkip, kContinue, kRepeat };
 }  // namespace Widelands
 
 #endif  // end of include guard: WL_LOGIC_MAP_OBJECTS_TRIBES_PROGRAM_RESULT_H
 
=== modified file 'src/logic/map_objects/tribes/trainingsite.cc'
--- src/logic/map_objects/tribes/trainingsite.cc	2019-02-23 11:00:49 +0000
+++ src/logic/map_objects/tribes/trainingsite.cc	2019-04-10 16:40:56 +0000
@@ -270,7 +270,7 @@
      soldier_request_(nullptr),
      capacity_(descr().get_max_number_of_soldiers()),
      build_heroes_(false),
-     result_(Failed) {
+     result_(ProgramResult::kFailed) {
 	set_soldier_control(&soldier_control_);
 
 	// Initialize this in the constructor so that loading code may
@@ -543,7 +543,7 @@
 	bool leftover_soldiers_check = true;
 
 	if (current_upgrade_) {
-		if (result_ == Completed) {
+		if (result_ == ProgramResult::kCompleted) {
 			drop_unupgradable_soldiers(game);
 			leftover_soldiers_check = false;
 			current_upgrade_->lastsuccess = true;
 
=== modified file 'src/logic/map_objects/tribes/tribe_descr.cc'
--- src/logic/map_objects/tribes/tribe_descr.cc	2019-03-24 12:06:43 +0000
+++ src/logic/map_objects/tribes/tribe_descr.cc	2019-04-10 16:40:56 +0000
@@ -174,7 +174,7 @@
 				throw GameDataError("Tribe has no indicators for resource %s.", resource.c_str());
 			}
 			resource_indicators_[resource] = resis;
-		};
+		}
 
 		ship_names_ = table.get_table("ship_names")->array_entries<std::string>();
 
 
=== modified file 'src/logic/map_objects/tribes/worker.cc'
--- src/logic/map_objects/tribes/worker.cc	2019-03-17 10:30:24 +0000
+++ src/logic/map_objects/tribes/worker.cc	2019-04-10 16:40:56 +0000
@@ -1060,34 +1060,34 @@
 	Bob::log_general_info(egbase);
 
 	if (upcast(PlayerImmovable, loc, location_.get(egbase))) {
-		FORMAT_WARNINGS_OFF;
+		FORMAT_WARNINGS_OFF
 		molog("* Owner: (%p)\n", &loc->owner());
-		FORMAT_WARNINGS_ON;
+		FORMAT_WARNINGS_ON
 		molog("** Owner (plrnr): %i\n", loc->owner().player_number());
-		FORMAT_WARNINGS_OFF;
+		FORMAT_WARNINGS_OFF
 		molog("* Economy: %p\n", loc->get_economy());
-		FORMAT_WARNINGS_ON;
+		FORMAT_WARNINGS_ON
 	}
 
 	PlayerImmovable* imm = location_.get(egbase);
 	molog("location: %u\n", imm ? imm->serial() : 0);
-	FORMAT_WARNINGS_OFF;
+	FORMAT_WARNINGS_OFF
 	molog("Economy: %p\n", economy_);
 	molog("transfer: %p\n", transfer_);
-	FORMAT_WARNINGS_ON;
+	FORMAT_WARNINGS_ON
 
 	if (upcast(WareInstance, ware, carried_ware_.get(egbase))) {
 		molog("* carried_ware->get_ware() (id): %i\n", ware->descr_index());
-		FORMAT_WARNINGS_OFF;
+		FORMAT_WARNINGS_OFF
 		molog("* carried_ware->get_economy() (): %p\n", ware->get_economy());
-		FORMAT_WARNINGS_ON;
+		FORMAT_WARNINGS_ON
 	}
 
 	molog("current_exp: %i / %i\n", current_exp_, descr().get_needed_experience());
 
-	FORMAT_WARNINGS_OFF;
+	FORMAT_WARNINGS_OFF
 	molog("supply: %p\n", supply_);
-	FORMAT_WARNINGS_ON;
+	FORMAT_WARNINGS_ON
 }
 
 /**
 
=== modified file 'src/logic/map_objects/world/terrain_description.h'
--- src/logic/map_objects/world/terrain_description.h	2019-02-23 11:00:49 +0000
+++ src/logic/map_objects/world/terrain_description.h	2019-04-10 16:40:56 +0000
@@ -43,7 +43,7 @@
 
 class TerrainDescription {
 public:
-	enum Is {
+	enum class Is {
 		kArable = 0,
 		kWalkable = 1,
 		kWater = 2,
@@ -149,6 +149,14 @@
 	DISALLOW_COPY_AND_ASSIGN(TerrainDescription);
 };
 
+inline TerrainDescription::Is operator|(TerrainDescription::Is left, TerrainDescription::Is right) {
+	return TerrainDescription::Is(static_cast<int>(left) | static_cast<int>(right));
+}
+inline int operator&(TerrainDescription::Is left, TerrainDescription::Is right) {
+	return static_cast<int>(left) & static_cast<int>(right);
+}
+
+
 }  // namespace Widelands
 
 #endif  // end of include guard: WL_LOGIC_MAP_OBJECTS_WORLD_TERRAIN_DESCRIPTION_H
 
=== modified file 'src/logic/mapdifferenceregion.h'
--- src/logic/mapdifferenceregion.h	2019-02-23 11:00:49 +0000
+++ src/logic/mapdifferenceregion.h	2019-04-10 16:40:56 +0000
@@ -48,12 +48,12 @@
 			map.neighbour_function(area_, &area_);                                                    \
 		break;
 
-			DIRECTION_CASE(WALK_NW, get_tln);
-			DIRECTION_CASE(WALK_NE, get_trn);
-			DIRECTION_CASE(WALK_E, get_rn);
-			DIRECTION_CASE(WALK_SE, get_brn);
-			DIRECTION_CASE(WALK_SW, get_bln);
-			DIRECTION_CASE(WALK_W, get_ln);
+			DIRECTION_CASE(WALK_NW, get_tln)
+			DIRECTION_CASE(WALK_NE, get_trn)
+			DIRECTION_CASE(WALK_E, get_rn)
+			DIRECTION_CASE(WALK_SE, get_brn)
+			DIRECTION_CASE(WALK_SW, get_bln)
+			DIRECTION_CASE(WALK_W, get_ln)
 #undef DIRECTION_CASE
 		}
 		--direction;
 
=== modified file 'src/logic/maphollowregion.cc'
--- src/logic/maphollowregion.cc	2019-02-23 11:00:49 +0000
+++ src/logic/maphollowregion.cc	2019-04-10 16:40:56 +0000
@@ -24,7 +24,7 @@
 template <>
 MapHollowRegion<Area<>>::MapHollowRegion(const Map& map, const HollowArea<Area<>>& hollow_area)
    : hollow_area_(hollow_area),
-     phase_(Top),
+     phase_(Phase::kTop),
      delta_radius_(hollow_area.radius - hollow_area.hole_radius),
      row_(0),
      rowwidth_(hollow_area.radius + 1),
@@ -37,12 +37,13 @@
 }
 
 template <> bool MapHollowRegion<Area<>>::advance(const Map& map) {
-	if (phase_ == None)
+	if (phase_ == Phase::kNone) {
 		return false;
+	}
 	++rowpos_;
 	if (rowpos_ < rowwidth_) {
 		map.get_rn(hollow_area_, &hollow_area_);
-		if ((phase_ & (Upper | Lower)) && rowpos_ == delta_radius_) {
+		if ((phase_ & (Phase::kUpper | Phase::kLower)) && rowpos_ == delta_radius_) {
 			//  Jump over the hole.
 			const uint32_t holewidth = rowwidth_ - 2 * delta_radius_;
 			for (uint32_t i = 0; i < holewidth; ++i)
@@ -51,27 +52,29 @@
 		}
 	} else {
 		++row_;
-		if (phase_ == Top && row_ == delta_radius_)
-			phase_ = Upper;
+		if (phase_ == Phase::kTop && row_ == delta_radius_) {
+			phase_ = Phase::kUpper;
+		}
 
 		// If we completed the widest, center line, switch into lower mode
 		// There are radius_+1 lines in the upper "half", because the upper
 		// half includes the center line.
-		else if (phase_ == Upper && row_ > hollow_area_.radius) {
+		else if (phase_ == Phase::kUpper && row_ > hollow_area_.radius) {
 			row_ = 1;
-			phase_ = Lower;
+			phase_ = Phase::kLower;
 		}
 
-		if (phase_ & (Top | Upper)) {
+		if (phase_ & (Phase::kTop | Phase::kUpper)) {
 			map.get_bln(left_, &hollow_area_);
 			++rowwidth_;
 		} else {
 
 			if (row_ > hollow_area_.radius) {
-				phase_ = None;
+				phase_ = Phase::kNone;
 				return true;  // early out
-			} else if (phase_ == Lower && row_ > hollow_area_.hole_radius)
-				phase_ = Bottom;
+			} else if (phase_ == Phase::kLower && row_ > hollow_area_.hole_radius) {
+				phase_ = Phase::kBottom;
+			}
 
 			map.get_brn(left_, &hollow_area_);
 			--rowwidth_;
 
=== modified file 'src/logic/maphollowregion.h'
--- src/logic/maphollowregion.h	2019-02-23 11:00:49 +0000
+++ src/logic/maphollowregion.h	2019-04-10 16:40:56 +0000
@@ -55,15 +55,15 @@
 	 */
 	bool advance(const Map&);
 
+	enum class Phase {
+		kNone = 0,    // not initialized or completed
+		kTop = 1,     // above the hole
+		kUpper = 2,   // upper half
+		kLower = 4,   // lower half
+		kBottom = 8,  // below the hole
+	};
+
 private:
-	enum Phase {
-		None = 0,    // not initialized or completed
-		Top = 1,     // above the hole
-		Upper = 2,   // upper half
-		Lower = 4,   // lower half
-		Bottom = 8,  // below the hole
-	};
-
 	HollowArea<AreaType> hollow_area_;
 	Phase phase_;
 	const uint32_t delta_radius_;
@@ -77,6 +77,14 @@
 template <>
 MapHollowRegion<Area<>>::MapHollowRegion(const Map& map, const HollowArea<Area<>>& hollow_area);
 template <> bool MapHollowRegion<Area<>>::advance(const Map& map);
+
+// A bunch of operators that turn MapHollowRegion<Area<>>::Phase into a bitwise combinable class.
+inline MapHollowRegion<Area<>>::Phase operator|(MapHollowRegion<Area<>>::Phase left, MapHollowRegion<Area<>>::Phase right) {
+	return MapHollowRegion<Area<>>::Phase(static_cast<int>(left) | static_cast<int>(right));
+}
+inline int operator&(MapHollowRegion<Area<>>::Phase left, MapHollowRegion<Area<>>::Phase right) {
+	return static_cast<int>(left) & static_cast<int>(right);
+}
 }  // namespace Widelands
 
 #endif  // end of include guard: WL_LOGIC_MAPHOLLOWREGION_H
 
=== modified file 'src/logic/maptriangleregion.cc'
--- src/logic/maptriangleregion.cc	2019-02-23 11:00:49 +0000
+++ src/logic/maptriangleregion.cc	2019-04-10 16:40:56 +0000
@@ -36,18 +36,18 @@
 			remaining_rows_in_lower_phase_ = (area.radius - 1) / 2;
 			if (radius_is_odd_) {
 				map.get_trn(area.node, &area.node);
-				phase_ = Top;
+				phase_ = Phase::kTop;
 				row_length_ = area.radius + 2;
 				remaining_in_row_ = radius_plus_1 / 2;
 				area.t = TriangleIndex::D;
 			} else {
-				phase_ = Upper;
+				phase_ = Phase::kUpper;
 				remaining_in_row_ = row_length_ = radius_plus_1;
 				area.t = TriangleIndex::R;
 			}
 		} else {
 			assert(area.radius == 0);
-			phase_ = Bottom;
+			phase_ = Phase::kBottom;
 			remaining_in_row_ = 0;
 			area.t = TriangleIndex::R;
 		}
@@ -57,12 +57,12 @@
 		if (radius_is_odd_) {
 			map.get_ln(area.node, &area.node);
 			left_ = area.node;
-			phase_ = Upper;
+			phase_ = Phase::kUpper;
 			remaining_in_row_ = row_length_ = area.radius + 2;
 			area.t = TriangleIndex::R;
 		} else {
 			map.get_bln(area.node, &left_);
-			phase_ = Top;
+			phase_ = Phase::kTop;
 			row_length_ = area.radius + 3;
 			remaining_in_row_ = half_radius_rounded_down + (0 < area.radius);
 			area.t = TriangleIndex::D;
@@ -77,17 +77,17 @@
 		return false;
 	--remaining_in_row_;
 	switch (phase_) {
-	case Top:
+	case Phase::kTop:
 		if (remaining_in_row_)
 			map.get_rn(location_.node, &location_.node);
 		else if (remaining_rows_in_upper_phase_) {
-			phase_ = Upper;
+			phase_ = Phase::kUpper;
 			remaining_in_row_ = row_length_;
 			assert(remaining_in_row_);
 			location_ = TCoords<>(left_, location_.t);
 		}
 		break;
-	case Upper:
+	case Phase::kUpper:
 		if (remaining_in_row_) {
 			if (location_.t == TriangleIndex::D)
 				location_.t = TriangleIndex::R;
@@ -99,11 +99,11 @@
 				left_ = map.bl_n(left_);
 			} else {
 				if (remaining_rows_in_lower_phase_) {
-					phase_ = Lower;
+					phase_ = Phase::kLower;
 					assert(row_length_ >= 2);
 					row_length_ -= 2;
 				} else if (location_.t == TriangleIndex::R) {
-					phase_ = Bottom;
+					phase_ = Phase::kBottom;
 					row_length_ /= 2;
 				} else
 					return false;
@@ -113,7 +113,7 @@
 			location_ = TCoords<>(left_, location_.t);
 		}
 		break;
-	case Lower:
+	case Phase::kLower:
 		if (remaining_in_row_) {
 			if (location_.t == TriangleIndex::D)
 				location_.t = TriangleIndex::R;
@@ -125,14 +125,14 @@
 				remaining_in_row_ = row_length_ -= 2;
 				left_ = map.br_n(left_);
 			} else if (location_.t == TriangleIndex::R) {
-				phase_ = Bottom;
+				phase_ = Phase::kBottom;
 				remaining_in_row_ = row_length_ / 2;
 				left_ = map.br_n(left_);
 			}
 			location_ = TCoords<>(left_, location_.t);
 		}
 		break;
-	case Bottom:
+	case Phase::kBottom:
 		if (remaining_in_row_)
 			map.get_rn(location_.node, &location_.node);
 		break;
@@ -156,17 +156,17 @@
 			remaining_rows_in_lower_phase_ = (area.radius - 1) / 2;
 			if (radius_is_odd_) {
 				map.get_trn(area.node, &area.node);
-				phase_ = Top;
+				phase_ = Phase::kTop;
 				row_length_ = area.radius + 2;
 				remaining_in_row_ = radius_plus_1 / 2;
 				area.t = TriangleIndex::D;
 			} else {
-				phase_ = Upper;
+				phase_ = Phase::kUpper;
 				remaining_in_row_ = row_length_ = radius_plus_1;
 				area.t = TriangleIndex::R;
 			}
 		} else {
-			phase_ = Bottom;
+			phase_ = Phase::kBottom;
 			remaining_in_row_ = 0;
 			area.t = TriangleIndex::R;
 		}
@@ -176,12 +176,12 @@
 		if (radius_is_odd_) {
 			map.get_ln(area.node, &area.node);
 			left_ = area.node;
-			phase_ = Upper;
+			phase_ = Phase::kUpper;
 			remaining_in_row_ = row_length_ = area.radius + 2;
 			area.t = TriangleIndex::R;
 		} else {
 			map.get_bln(area.node, &left_);
-			phase_ = Top;
+			phase_ = Phase::kTop;
 			row_length_ = area.radius + 3;
 			remaining_in_row_ = half_radius_rounded_down + (0 < area.radius);
 			area.t = TriangleIndex::D;
@@ -197,17 +197,17 @@
 		return false;
 	--remaining_in_row_;
 	switch (phase_) {
-	case Top:
+	case Phase::kTop:
 		if (remaining_in_row_)
 			map.get_rn(location_.node, &location_.node);
 		else if (remaining_rows_in_upper_phase_) {
-			phase_ = Upper;
+			phase_ = Phase::kUpper;
 			remaining_in_row_ = row_length_;
 			assert(remaining_in_row_);
 			location_ = TCoords<FCoords>(left_, location_.t);
 		}
 		break;
-	case Upper:
+	case Phase::kUpper:
 		if (remaining_in_row_) {
 			if (location_.t == TriangleIndex::D)
 				location_.t = TriangleIndex::R;
@@ -219,11 +219,11 @@
 				left_ = map.bl_n(left_);
 			} else {
 				if (remaining_rows_in_lower_phase_) {
-					phase_ = Lower;
+					phase_ = Phase::kLower;
 					assert(row_length_ >= 2);
 					row_length_ -= 2;
 				} else if (location_.t == TriangleIndex::R) {
-					phase_ = Bottom;
+					phase_ = Phase::kBottom;
 					row_length_ /= 2;
 				} else
 					return false;
@@ -233,7 +233,7 @@
 			location_ = TCoords<FCoords>(left_, location_.t);
 		}
 		break;
-	case Lower:
+	case Phase::kLower:
 		if (remaining_in_row_) {
 			if (location_.t == TriangleIndex::D)
 				location_.t = TriangleIndex::R;
@@ -245,14 +245,14 @@
 				remaining_in_row_ = row_length_ -= 2;
 				left_ = map.br_n(left_);
 			} else if (location_.t == TriangleIndex::R) {
-				phase_ = Bottom;
+				phase_ = Phase::kBottom;
 				remaining_in_row_ = row_length_ / 2;
 				left_ = map.br_n(left_);
 			}
 			location_ = TCoords<FCoords>(left_, location_.t);
 		}
 		break;
-	case Bottom:
+	case Phase::kBottom:
 		if (remaining_in_row_)
 			map.get_rn(location_.node, &location_.node);
 		break;
 
=== modified file 'src/logic/maptriangleregion.h'
--- src/logic/maptriangleregion.h	2019-02-23 11:00:49 +0000
+++ src/logic/maptriangleregion.h	2019-04-10 16:40:56 +0000
@@ -114,7 +114,7 @@
 
 private:
 	const bool radius_is_odd_ = false;
-	enum { Top, Upper, Lower, Bottom } phase_ = Top;
+	enum class Phase { kTop, kUpper, kLower, kBottom } phase_ = Phase::kTop;
 	uint16_t remaining_rows_in_upper_phase_ = 0U;
 	uint16_t remaining_rows_in_lower_phase_ = 0U;
 	uint16_t row_length_, remaining_in_row_ = 0U;
 
=== modified file 'src/logic/player.cc'
--- src/logic/player.cc	2019-03-09 08:58:52 +0000
+++ src/logic/player.cc	2019-04-10 16:40:56 +0000
@@ -329,8 +329,8 @@
 	}
 
 	if (g_options.pull_section("global").get_bool("sound_at_message", true)) {
-		MAYBE_PLAY(Message::Type::kEconomySiteOccupied, "military/site_occupied");
-		MAYBE_PLAY(Message::Type::kWarfareUnderAttack, "military/under_attack");
+		MAYBE_PLAY(Message::Type::kEconomySiteOccupied, "military/site_occupied")
+		MAYBE_PLAY(Message::Type::kWarfareUnderAttack, "military/under_attack")
 		Notifications::publish(NoteSound("message", 200, PRIO_ALWAYS_PLAY));
 	}
 }
 
=== modified file 'src/map_io/map_buildingdata_packet.cc'
--- src/map_io/map_buildingdata_packet.cc	2019-02-23 11:00:49 +0000
+++ src/map_io/map_buildingdata_packet.cc	2019-04-10 16:40:56 +0000
@@ -666,7 +666,7 @@
 
 				productionsite.stack_[i].program = productionsite.descr().get_program(program_name);
 				productionsite.stack_[i].ip = fr.signed_32();
-				productionsite.stack_[i].phase = fr.signed_32();
+				productionsite.stack_[i].phase = static_cast<ProgramResult>(fr.signed_32());
 				productionsite.stack_[i].flags = fr.unsigned_32();
 
 				uint32_t serial = fr.unsigned_32();
@@ -1135,7 +1135,8 @@
 	for (uint16_t i = 0; i < program_size; ++i) {
 		fw.string(productionsite.stack_[i].program->name());
 		fw.signed_32(productionsite.stack_[i].ip);
-		fw.signed_32(productionsite.stack_[i].phase);
+		// TODO(GunChleoc): If we ever change this packet, we can have an uint8 here.
+		fw.signed_32(static_cast<int>(productionsite.stack_[i].phase));
 		fw.unsigned_32(productionsite.stack_[i].flags);
 		fw.unsigned_32(mos.get_object_file_index_or_zero(productionsite.stack_[i].objvar.get(game)));
 		write_coords_32(&fw, productionsite.stack_[i].coord);
 
=== modified file 'src/map_io/map_players_view_packet.cc'
--- src/map_io/map_players_view_packet.cc	2019-02-23 11:00:49 +0000
+++ src/map_io/map_players_view_packet.cc	2019-04-10 16:40:56 +0000
@@ -434,47 +434,47 @@
 		OPEN_INPUT_FILE_NEW_VERSION(FileRead, node_immovable_kinds_file,
 		                            node_immovable_kinds_filename, node_immovable_kinds_file_version,
 		                            NODE_IMMOVABLE_KINDS_FILENAME_TEMPLATE,
-		                            kCurrentPacketVersionImmovableKinds);
+		                            kCurrentPacketVersionImmovableKinds)
 
 		OPEN_INPUT_FILE_NEW_VERSION(FileRead, node_immovables_file, node_immovables_filename,
 		                            node_immovables_file_version, NODE_IMMOVABLES_FILENAME_TEMPLATE,
-		                            kCurrentPacketVersionImmovables);
+		                            kCurrentPacketVersionImmovables)
 
 		OPEN_INPUT_FILE_NEW_VERSION(FileRead, roads_file, roads_filename, road_file_version,
-		                            ROADS_FILENAME_TEMPLATE, kCurrentPacketVersionRoads);
+		                            ROADS_FILENAME_TEMPLATE, kCurrentPacketVersionRoads)
 
 		OPEN_INPUT_FILE_NEW_VERSION(FileRead, terrains_file, terrains_filename, terrains_file_version,
-		                            TERRAINS_FILENAME_TEMPLATE, kCurrentPacketVersionTerrains);
+		                            TERRAINS_FILENAME_TEMPLATE, kCurrentPacketVersionTerrains)
 
 		OPEN_INPUT_FILE_NEW_VERSION(
 		   FileRead, triangle_immovable_kinds_file, triangle_immovable_kinds_filename,
 		   triangle_immovable_kinds_file_version, TRIANGLE_IMMOVABLE_KINDS_FILENAME_TEMPLATE,
-		   kCurrentPacketVersionImmovableKinds);
+		   kCurrentPacketVersionImmovableKinds)
 
 		OPEN_INPUT_FILE_NEW_VERSION(FileRead, triangle_immovables_file, triangle_immovables_filename,
 		                            triangle_immovables_file_version,
 		                            TRIANGLE_IMMOVABLES_FILENAME_TEMPLATE,
-		                            kCurrentPacketVersionImmovables);
+		                            kCurrentPacketVersionImmovables)
 
 		OPEN_INPUT_FILE(FileRead, owners_file, owners_filename, OWNERS_FILENAME_TEMPLATE,
-		                kCurrentPacketVersionOwners);
+		                kCurrentPacketVersionOwners)
 
 		OPEN_INPUT_FILE_NEW_VERSION(FileRead, surveys_file, surveys_filename, surveys_file_version,
-		                            SURVEYS_FILENAME_TEMPLATE, kCurrentPacketVersionSurveys);
+		                            SURVEYS_FILENAME_TEMPLATE, kCurrentPacketVersionSurveys)
 
 		OPEN_INPUT_FILE_NEW_VERSION(FileRead, survey_amounts_file, survey_amounts_filename,
 		                            survey_amounts_file_version, SURVEY_AMOUNTS_FILENAME_TEMPLATE,
-		                            kCurrentPacketVersionSurveyAmounts);
+		                            kCurrentPacketVersionSurveyAmounts)
 
 		OPEN_INPUT_FILE(FileRead, survey_times_file, survey_times_filename,
-		                SURVEY_TIMES_FILENAME_TEMPLATE, kCurrentPacketVersionSurveyTimes);
+		                SURVEY_TIMES_FILENAME_TEMPLATE, kCurrentPacketVersionSurveyTimes)
 
 		OPEN_INPUT_FILE_NEW_VERSION(FileRead, border_file, border_filename, border_file_version,
-		                            BORDER_FILENAME_TEMPLATE, kCurrentPacketVersionBorder);
+		                            BORDER_FILENAME_TEMPLATE, kCurrentPacketVersionBorder)
 
 		OPEN_INPUT_FILE_NEW_VERSION_SILENT(FileRead, hidden_file, hidden_filename,
 		                                   hidden_file_version, HIDDEN_FILENAME_TEMPLATE,
-		                                   kCurrentPacketVersionHidden);
+		                                   kCurrentPacketVersionHidden)
 
 		for (FCoords first_in_row(Coords(0, 0), &first_field); first_in_row.y < mapheight;
 		     ++first_in_row.y, first_in_row.field += mapwidth) {
@@ -801,19 +801,19 @@
 			                            hidden_file_version, kCurrentPacketVersionHidden);
 		}
 
-		CHECK_TRAILING_BYTES(unseen_times_file, unseen_times_filename);
-		CHECK_TRAILING_BYTES(node_immovable_kinds_file, node_immovable_kinds_filename);
-		CHECK_TRAILING_BYTES(node_immovables_file, node_immovables_filename);
-		CHECK_TRAILING_BYTES(roads_file, roads_filename);
-		CHECK_TRAILING_BYTES(terrains_file, terrains_filename);
-		CHECK_TRAILING_BYTES(triangle_immovable_kinds_file, triangle_immovable_kinds_filename);
-		CHECK_TRAILING_BYTES(triangle_immovables_file, triangle_immovables_filename);
-		CHECK_TRAILING_BYTES(owners_file, owners_filename);
-		CHECK_TRAILING_BYTES(surveys_file, surveys_filename);
-		CHECK_TRAILING_BYTES(survey_amounts_file, survey_amounts_filename);
-		CHECK_TRAILING_BYTES(survey_times_file, survey_times_filename);
-		CHECK_TRAILING_BYTES(border_file, border_filename);
-		CHECK_TRAILING_BYTES(hidden_file, hidden_filename);
+		CHECK_TRAILING_BYTES(unseen_times_file, unseen_times_filename)
+		CHECK_TRAILING_BYTES(node_immovable_kinds_file, node_immovable_kinds_filename)
+		CHECK_TRAILING_BYTES(node_immovables_file, node_immovables_filename)
+		CHECK_TRAILING_BYTES(roads_file, roads_filename)
+		CHECK_TRAILING_BYTES(terrains_file, terrains_filename)
+		CHECK_TRAILING_BYTES(triangle_immovable_kinds_file, triangle_immovable_kinds_filename)
+		CHECK_TRAILING_BYTES(triangle_immovables_file, triangle_immovables_filename)
+		CHECK_TRAILING_BYTES(owners_file, owners_filename)
+		CHECK_TRAILING_BYTES(surveys_file, surveys_filename)
+		CHECK_TRAILING_BYTES(survey_amounts_file, survey_amounts_filename)
+		CHECK_TRAILING_BYTES(survey_times_file, survey_times_filename)
+		CHECK_TRAILING_BYTES(border_file, border_filename)
+		CHECK_TRAILING_BYTES(hidden_file, hidden_filename)
 	}
 }
 
@@ -1011,38 +1011,38 @@
 		fs.ensure_directory_exists(
 		   (boost::format(DIRNAME_TEMPLATE) % static_cast<unsigned int>(plnum)).str());
 
-		WRITE(unseen_times_file, UNSEEN_TIMES_FILENAME_TEMPLATE, kCurrentPacketVersionUnseenTimes);
+		WRITE(unseen_times_file, UNSEEN_TIMES_FILENAME_TEMPLATE, kCurrentPacketVersionUnseenTimes)
 
 		WRITE(node_immovable_kinds_file, NODE_IMMOVABLE_KINDS_FILENAME_TEMPLATE,
-		      kCurrentPacketVersionImmovableKinds);
+		      kCurrentPacketVersionImmovableKinds)
 
 		WRITE(
-		   node_immovables_file, NODE_IMMOVABLES_FILENAME_TEMPLATE, kCurrentPacketVersionImmovables);
-
-		WRITE(roads_file, ROADS_FILENAME_TEMPLATE, kCurrentPacketVersionRoads);
-
-		WRITE(terrains_file, TERRAINS_FILENAME_TEMPLATE, kCurrentPacketVersionTerrains);
+		   node_immovables_file, NODE_IMMOVABLES_FILENAME_TEMPLATE, kCurrentPacketVersionImmovables)
+
+		WRITE(roads_file, ROADS_FILENAME_TEMPLATE, kCurrentPacketVersionRoads)
+
+		WRITE(terrains_file, TERRAINS_FILENAME_TEMPLATE, kCurrentPacketVersionTerrains)
 
 		WRITE(triangle_immovable_kinds_file, TRIANGLE_IMMOVABLE_KINDS_FILENAME_TEMPLATE,
-		      kCurrentPacketVersionImmovableKinds);
+		      kCurrentPacketVersionImmovableKinds)
 
 		WRITE(triangle_immovables_file, TRIANGLE_IMMOVABLES_FILENAME_TEMPLATE,
-		      kCurrentPacketVersionImmovables);
-
-		WRITE(owners_file, OWNERS_FILENAME_TEMPLATE, kCurrentPacketVersionOwners);
-
-		WRITE(surveys_file, SURVEYS_FILENAME_TEMPLATE, kCurrentPacketVersionSurveys);
+		      kCurrentPacketVersionImmovables)
+
+		WRITE(owners_file, OWNERS_FILENAME_TEMPLATE, kCurrentPacketVersionOwners)
+
+		WRITE(surveys_file, SURVEYS_FILENAME_TEMPLATE, kCurrentPacketVersionSurveys)
 
 		WRITE(
-		   survey_amounts_file, SURVEY_AMOUNTS_FILENAME_TEMPLATE, kCurrentPacketVersionSurveyAmounts);
-
-		WRITE(survey_times_file, SURVEY_TIMES_FILENAME_TEMPLATE, kCurrentPacketVersionSurveyTimes);
-
-		WRITE(hidden_file, HIDDEN_FILENAME_TEMPLATE, kCurrentPacketVersionHidden);
-
-		WRITE(vision_file, VISION_FILENAME_TEMPLATE, kCurrentPacketVersionVision);
-
-		WRITE(border_file, BORDER_FILENAME_TEMPLATE, kCurrentPacketVersionBorder);
+		   survey_amounts_file, SURVEY_AMOUNTS_FILENAME_TEMPLATE, kCurrentPacketVersionSurveyAmounts)
+
+		WRITE(survey_times_file, SURVEY_TIMES_FILENAME_TEMPLATE, kCurrentPacketVersionSurveyTimes)
+
+		WRITE(hidden_file, HIDDEN_FILENAME_TEMPLATE, kCurrentPacketVersionHidden)
+
+		WRITE(vision_file, VISION_FILENAME_TEMPLATE, kCurrentPacketVersionVision)
+
+		WRITE(border_file, BORDER_FILENAME_TEMPLATE, kCurrentPacketVersionBorder)
 	}
 }
 }  // namespace Widelands
 
=== modified file 'src/map_io/s2map.cc'
--- src/map_io/s2map.cc	2019-02-23 11:00:49 +0000
+++ src/map_io/s2map.cc	2019-04-10 16:40:56 +0000
@@ -704,7 +704,7 @@
 				res = "";
 				amount = 0;
 				break;
-			};
+			}
 
 			Widelands::DescriptionIndex nres = 0;
 			if (*res) {
 
=== modified file 'src/scripting/lua_bases.cc'
--- src/scripting/lua_bases.cc	2019-02-23 11:00:49 +0000
+++ src/scripting/lua_bases.cc	2019-04-10 16:40:56 +0000
@@ -572,7 +572,7 @@
 	PERS_UINT32("player", player_number_);
 }
 void LuaPlayerBase::__unpersist(lua_State* L) {
-	UNPERS_UINT32("player", player_number_);
+	UNPERS_UINT32("player", player_number_)
 }
 
 /*
 
=== modified file 'src/scripting/lua_game.cc'
--- src/scripting/lua_game.cc	2019-03-09 08:58:52 +0000
+++ src/scripting/lua_game.cc	2019-04-10 16:40:56 +0000
@@ -435,10 +435,10 @@
 	lua_pop(L, 1);
 
 	if (lua_gettop(L) == 4) {
-		CHECK_UINT(posx);
-		CHECK_UINT(posy);
-		CHECK_UINT(w);
-		CHECK_UINT(h);
+		CHECK_UINT(posx)
+		CHECK_UINT(posy)
+		CHECK_UINT(w)
+		CHECK_UINT(h)
 
 		// If a field has been defined, read the coordinates to jump to.
 		lua_getfield(L, 4, "field");
@@ -959,7 +959,7 @@
 	PERS_STRING("name", name_);
 }
 void LuaObjective::__unpersist(lua_State* L) {
-	UNPERS_STRING("name", name_);
+	UNPERS_STRING("name", name_)
 }
 
 /*
@@ -1126,9 +1126,9 @@
 	PERS_UINT32("msg_idx", get_mos(L)->message_savers[player_number_ - 1][message_id_].value());
 }
 void LuaMessage::__unpersist(lua_State* L) {
-	UNPERS_UINT32("player", player_number_);
+	UNPERS_UINT32("player", player_number_)
 	uint32_t midx = 0;
-	UNPERS_UINT32("msg_idx", midx);
+	UNPERS_UINT32("msg_idx", midx)
 	message_id_ = MessageId(midx);
 }
 
 
=== modified file 'src/scripting/lua_map.cc'
--- src/scripting/lua_map.cc	2019-04-07 05:46:13 +0000
+++ src/scripting/lua_map.cc	2019-04-10 16:40:56 +0000
@@ -545,10 +545,10 @@
 	lua_pushuint32(L, idx);                                                                         \
 	lua_pushuint32(L, i.first.name);                                                                \
 	lua_rawset(L, -3);
-			PUSHLEVEL(1, health);
-			PUSHLEVEL(2, attack);
-			PUSHLEVEL(3, defense);
-			PUSHLEVEL(4, evade);
+			PUSHLEVEL(1, health)
+			PUSHLEVEL(2, attack)
+			PUSHLEVEL(3, defense)
+			PUSHLEVEL(4, evade)
 #undef PUSHLEVEL
 
 			lua_pushuint32(L, i.second);
@@ -1539,7 +1539,7 @@
 
 void LuaTribeDescription::__unpersist(lua_State* L) {
 	std::string name;
-	UNPERS_STRING("name", name);
+	UNPERS_STRING("name", name)
 	const Tribes& tribes = get_egbase(L).tribes();
 	DescriptionIndex idx = tribes.safe_tribe_index(name);
 	set_description_pointer(tribes.get_tribe_descr(idx));
@@ -1993,7 +1993,7 @@
 
 void LuaImmovableDescription::__unpersist(lua_State* L) {
 	std::string name;
-	UNPERS_STRING("name", name);
+	UNPERS_STRING("name", name)
 	const World& world = get_egbase(L).world();
 	DescriptionIndex idx = world.get_immovable_index(name);
 	if (idx != INVALID_INDEX) {
@@ -2215,7 +2215,7 @@
 
 void LuaBuildingDescription::__unpersist(lua_State* L) {
 	std::string name;
-	UNPERS_STRING("name", name);
+	UNPERS_STRING("name", name)
 	const Tribes& tribes = get_egbase(L).tribes();
 	DescriptionIndex idx = tribes.safe_building_index(name.c_str());
 	set_description_pointer(tribes.get_building_descr(idx));
@@ -3070,7 +3070,7 @@
 
 void LuaWareDescription::__unpersist(lua_State* L) {
 	std::string name;
-	UNPERS_STRING("name", name);
+	UNPERS_STRING("name", name)
 	const Tribes& tribes = get_egbase(L).tribes();
 	DescriptionIndex idx = tribes.safe_ware_index(name.c_str());
 	set_description_pointer(tribes.get_ware_descr(idx));
@@ -3188,7 +3188,7 @@
 
 void LuaWorkerDescription::__unpersist(lua_State* L) {
 	std::string name;
-	UNPERS_STRING("name", name);
+	UNPERS_STRING("name", name)
 	const Tribes& tribes = get_egbase(L).tribes();
 	DescriptionIndex idx = tribes.safe_worker_index(name.c_str());
 	set_description_pointer(tribes.get_worker_descr(idx));
@@ -3469,7 +3469,7 @@
 
 void LuaResourceDescription::__unpersist(lua_State* L) {
 	std::string name;
-	UNPERS_STRING("name", name);
+	UNPERS_STRING("name", name)
 	const World& world = get_egbase(L).world();
 	const ResourceDescription* descr = world.get_resource(world.safe_resource_index(name.c_str()));
 	set_description_pointer(descr);
@@ -3590,7 +3590,7 @@
 
 void LuaTerrainDescription::__unpersist(lua_State* L) {
 	std::string name;
-	UNPERS_STRING("name", name);
+	UNPERS_STRING("name", name)
 	set_description_pointer(get_egbase(L).world().terrain_descr(name));
 }
 
@@ -3776,8 +3776,8 @@
 void LuaEconomy::__unpersist(lua_State* L) {
 	Widelands::PlayerNumber player_number;
 	Widelands::Serial economy_serial;
-	UNPERS_UINT32("player", player_number);
-	UNPERS_UINT32("economy", economy_serial);
+	UNPERS_UINT32("player", player_number)
+	UNPERS_UINT32("economy", economy_serial)
 	const Widelands::Player& player = get_egbase(L).player(player_number);
 	set_economy_pointer(player.get_economy(economy_serial));
 }
@@ -3929,7 +3929,7 @@
 }
 void LuaMapObject::__unpersist(lua_State* L) {
 	uint32_t idx;
-	UNPERS_UINT32("file_index", idx);
+	UNPERS_UINT32("file_index", idx)
 
 	if (!idx)
 		ptr_ = nullptr;
@@ -6179,8 +6179,8 @@
 }
 
 void LuaField::__unpersist(lua_State* L) {
-	UNPERS_INT32("x", coords_.x);
-	UNPERS_INT32("y", coords_.y);
+	UNPERS_INT32("x", coords_.x)
+	UNPERS_INT32("y", coords_.y)
 }
 
 /*
@@ -6727,7 +6727,7 @@
 }
 
 void LuaPlayerSlot::__unpersist(lua_State* L) {
-	UNPERS_UINT32("player", player_number_);
+	UNPERS_UINT32("player", player_number_)
 }
 
 /*
 
=== modified file 'src/sound/sound_handler.cc'
--- src/sound/sound_handler.cc	2019-02-23 11:00:49 +0000
+++ src/sound/sound_handler.cc	2019-04-10 16:40:56 +0000
@@ -112,7 +112,7 @@
 		nosound_ = true;
 	}
 
-	SDL_MIXER_VERSION(&sdl_version);
+	SDL_MIXER_VERSION(&sdl_version)
 	log("SDL_mixer version: %d.%d.%d\n", static_cast<unsigned int>(sdl_version.major),
 	    static_cast<unsigned int>(sdl_version.minor), static_cast<unsigned int>(sdl_version.patch));
 
 
=== modified file 'src/ui_basic/box.cc'
--- src/ui_basic/box.cc	2019-02-23 11:00:49 +0000
+++ src/ui_basic/box.cc	2019-04-10 16:40:56 +0000
@@ -423,6 +423,6 @@
 
 	case Item::ItemSpace:
 		break;  //  no need to do anything
-	};
+	}
 }
 }  // namespace UI
 
=== modified file 'src/ui_basic/editbox.cc'
--- src/ui_basic/editbox.cc	2019-02-23 11:00:49 +0000
+++ src/ui_basic/editbox.cc	2019-04-10 16:40:56 +0000
@@ -208,7 +208,7 @@
 		case SDLK_DELETE:
 			if (m_->caret < m_->text.size()) {
 				while ((m_->text[++m_->caret] & 0xc0) == 0x80) {
-				};
+				}
 				// Now fallthrough to handle it like Backspace
 			} else {
 				return true;
@@ -232,7 +232,7 @@
 		case SDLK_LEFT:
 			if (m_->caret > 0) {
 				while ((m_->text[--m_->caret] & 0xc0) == 0x80) {
-				};
+				}
 				if (code.mod & (KMOD_LCTRL | KMOD_RCTRL))
 					for (uint32_t new_caret = m_->caret;; m_->caret = new_caret)
 						if (0 == new_caret || isspace(m_->text[--new_caret]))
@@ -250,7 +250,8 @@
 		case SDLK_RIGHT:
 			if (m_->caret < m_->text.size()) {
 				while ((m_->text[++m_->caret] & 0xc0) == 0x80) {
-				};
+					// We're just advancing the caret
+				}
 				if (code.mod & (KMOD_LCTRL | KMOD_RCTRL))
 					for (uint32_t new_caret = m_->caret;; ++new_caret)
 						if (new_caret == m_->text.size() || isspace(m_->text[new_caret - 1])) {
 
=== modified file 'src/ui_basic/unique_window.h'
--- src/ui_basic/unique_window.h	2019-02-23 11:00:49 +0000
+++ src/ui_basic/unique_window.h	2019-04-10 16:40:56 +0000
@@ -55,9 +55,6 @@
 		int32_t x, y;
 		bool valid_pos;
 
-		Registry(const Registry&) = default;
-		Registry& operator=(const Registry&) = default;
-
 		Registry() : window(nullptr), x(0), y(0), valid_pos(false) {
 		}
 		~Registry();
 
=== modified file 'src/ui_fsmenu/main.cc'
--- src/ui_fsmenu/main.cc	2019-02-23 11:00:49 +0000
+++ src/ui_fsmenu/main.cc	2019-04-10 16:40:56 +0000
@@ -114,7 +114,7 @@
 }
 
 void FullscreenMenuMain::clicked_ok() {
-	;  // do nothing
+  // do nothing
 }
 
 void FullscreenMenuMain::layout() {
 
=== modified file 'src/ui_fsmenu/netsetup_lan.cc'
--- src/ui_fsmenu/netsetup_lan.cc	2019-02-23 11:00:49 +0000
+++ src/ui_fsmenu/netsetup_lan.cc	2019-04-10 16:40:56 +0000
@@ -207,7 +207,7 @@
 		/** TRANSLATORS: The state of a LAN game can be open, closed or unknown */
 		er.set_string(2, pgettext("game_state", "Unknown"));
 		break;
-	};
+	}
 }
 
 void FullscreenMenuNetSetupLAN::game_opened(const NetOpenGame* game) {
 
=== modified file 'src/wui/interactive_player.cc'
--- src/wui/interactive_player.cc	2019-03-01 04:29:12 +0000
+++ src/wui/interactive_player.cc	2019-04-10 16:40:56 +0000
@@ -68,7 +68,7 @@
                                 const Widelands::Player::Field& pf) {
 	if (pf.vision == 0) {
 		return 0.;
-	};
+	}
 
 	uint32_t brightness = 144 + fcoords.field->get_brightness();
 	brightness = std::min<uint32_t>(255, (brightness * 255) / 160);