Merge branch 'master' of https://github.com/wesnoth/wesnoth

src/CMakeLists.txt

@@ -745,11 +745,11 @@ set(wesnoth-main_SRC
 	carryover.cpp
 	commandline_options.cpp
 	config_cache.cpp
-	configure_engine.cpp
-	connect_engine.cpp
+	game_initialization/configure_engine.cpp
+	game_initialization/connect_engine.cpp
 	controller_base.cpp
-	create_engine.cpp
-	depcheck.cpp
+	game_initialization/create_engine.cpp
+	game_initialization/depcheck.cpp
 	desktop/notifications.cpp
 	desktop/open.cpp
 	dialogs.cpp
@@ -785,7 +785,7 @@ set(wesnoth-main_SRC
 	fake_unit_manager.cpp
 	fake_unit_ptr.cpp
 	filechooser.cpp
-	flg_manager.cpp
+	game_initialization/flg_manager.cpp
 	floating_textbox.cpp
 	formula.cpp
 	formula_debugger.cpp
@@ -887,16 +887,16 @@ set(wesnoth-main_SRC
 	mouse_handler_base.cpp
 	movetype.cpp
 	mp_game_settings.cpp
-	mp_game_utils.cpp
-	mp_options.cpp
+	game_initialization/mp_game_utils.cpp
+	game_initialization/mp_options.cpp
 	mp_ui_alerts.cpp
-	multiplayer.cpp
-	multiplayer_configure.cpp
-	multiplayer_connect.cpp
-	multiplayer_create.cpp
-	multiplayer_lobby.cpp
-	multiplayer_ui.cpp
-	multiplayer_wait.cpp
+	game_initialization/multiplayer.cpp
+	game_initialization/multiplayer_configure.cpp
+	game_initialization/multiplayer_connect.cpp
+	game_initialization/multiplayer_create.cpp
+	game_initialization/multiplayer_lobby.cpp
+	game_initialization/multiplayer_ui.cpp
+	game_initialization/multiplayer_wait.cpp
 	network_asio.cpp
 	pathfind/pathfind.cpp
 	pathfind/teleport.cpp
@@ -904,7 +904,7 @@ set(wesnoth-main_SRC
 	persist_manager.cpp
 	persist_var.cpp
 	play_controller.cpp
-	playcampaign.cpp
+	game_initialization/playcampaign.cpp
 	playmp_controller.cpp
 	playsingle_controller.cpp
 	playturn.cpp
@@ -928,7 +928,7 @@ set(wesnoth-main_SRC
 	scripting/lua_types.cpp
 	settings.cpp
 	side_filter.cpp
-	singleplayer.cpp
+	game_initialization/singleplayer.cpp
 	statistics.cpp
 	statistics_dialog.cpp
 	storyscreen/controller.cpp

src/SConscript

@@ -233,13 +233,13 @@ wesnoth_sources = Split("""
     commandline_options.cpp
     carryover.cpp
     config_cache.cpp
-    configure_engine.cpp
-    connect_engine.cpp
+    game_initialization/configure_engine.cpp
+    game_initialization/connect_engine.cpp
     controller_base.cpp
-    create_engine.cpp
+    game_initialization/create_engine.cpp
     desktop/notifications.cpp
     desktop/open.cpp
-    depcheck.cpp
+    game_initialization/depcheck.cpp
     dialogs.cpp
     display_chat_manager.cpp
     editor/action/action.cpp
@@ -273,7 +273,7 @@ wesnoth_sources = Split("""
     fake_unit_manager.cpp
     fake_unit_ptr.cpp
     filechooser.cpp
-    flg_manager.cpp
+    game_initialization/flg_manager.cpp
     floating_textbox.cpp
     formula.cpp
     formula_debugger.cpp
@@ -476,16 +476,16 @@ wesnoth_sources = Split("""
     mouse_handler_base.cpp
     movetype.cpp
     mp_game_settings.cpp
-    mp_game_utils.cpp
-    mp_options.cpp
+    game_initialization/mp_game_utils.cpp
+    game_initialization/mp_options.cpp
     mp_ui_alerts.cpp
-    multiplayer.cpp
-    multiplayer_configure.cpp
-    multiplayer_connect.cpp
-    multiplayer_create.cpp
-    multiplayer_lobby.cpp
-    multiplayer_ui.cpp
-    multiplayer_wait.cpp
+    game_initialization/multiplayer.cpp
+    game_initialization/multiplayer_configure.cpp
+    game_initialization/multiplayer_connect.cpp
+    game_initialization/multiplayer_create.cpp
+    game_initialization/multiplayer_lobby.cpp
+    game_initialization/multiplayer_ui.cpp
+    game_initialization/multiplayer_wait.cpp
     network_asio.cpp
     pathfind/pathfind.cpp
     pathfind/teleport.cpp
@@ -493,7 +493,7 @@ wesnoth_sources = Split("""
     persist_manager.cpp
     persist_var.cpp
     play_controller.cpp
-    playcampaign.cpp
+    game_initialization/playcampaign.cpp
     playmp_controller.cpp
     playsingle_controller.cpp
     playturn.cpp
@@ -517,7 +517,7 @@ wesnoth_sources = Split("""
     scripting/lua_types.cpp
     settings.cpp
     side_filter.cpp
-    singleplayer.cpp
+    game_initialization/singleplayer.cpp
     statistics.cpp
     statistics_dialog.cpp
     storyscreen/controller.cpp

src/game_launcher.cpp

@@ -41,10 +41,10 @@
 #include "loadscreen.hpp"               // for loadscreen, etc
 #include "log.hpp"                      // for LOG_STREAM, logger, general, etc
 #include "map_exception.hpp"
-#include "multiplayer.hpp"              // for start_client, etc
-#include "create_engine.hpp"
+#include "game_initialization/multiplayer.hpp"              // for start_client, etc
+#include "game_initialization/create_engine.hpp"
 #include "network.hpp"
-#include "playcampaign.hpp"             // for play_game, etc
+#include "game_initialization/playcampaign.hpp"             // for play_game, etc
 #include "preferences.hpp"              // for disable_preferences_save, etc
 #include "preferences_display.hpp"      // for detect_video_settings, etc
 #include "replay.hpp"                   // for replay, recorder
@@ -53,7 +53,7 @@
 #include "sdl/utils.hpp"                // for surface
 #include "serialization/compression.hpp"  // for format::NONE
 #include "serialization/string_utils.hpp"  // for split
-#include "singleplayer.hpp"             // for sp_create_mode
+#include "game_initialization/singleplayer.hpp"             // for sp_create_mode
 #include "statistics.hpp"
 #include "tstring.hpp"                  // for operator==, operator!=
 #include "util.hpp"                     // for lexical_cast_default

src/gui/dialogs/campaign_selection.hpp

@@ -18,7 +18,7 @@
 #include "gui/dialogs/dialog.hpp"
 
 #include "config.hpp"
-#include "create_engine.hpp"
+#include "game_initialization/create_engine.hpp"
 
 namespace gui2
 {

src/gui/dialogs/campaign_settings.hpp

@@ -20,7 +20,7 @@
 #include "addon/validation.hpp"
 #include "addon/state.hpp"
 
-#include "create_engine.hpp"
+#include "game_initialization/create_engine.hpp"
 
 namespace gui2
 {

src/gui/dialogs/depcheck_select_new.hpp

@@ -16,7 +16,7 @@
 #define GUI_DIALOGS_MP_DEPCHECK_SELECT_NEW_HPP_INCLUDED
 
 #include "gui/dialogs/dialog.hpp"
-#include "depcheck.hpp"
+#include "game_initialization/depcheck.hpp"
 #include <vector>
 
 

src/gui/dialogs/mp_method_selection.cpp

@@ -27,7 +27,7 @@
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/text_box.hpp"
 #include "gui/widgets/toggle_button.hpp"
-#include "multiplayer.hpp"
+#include "game_initialization/multiplayer.hpp"
 
 namespace gui2
 {

src/savegame.cpp

@@ -21,7 +21,7 @@
 #include "save_index.hpp"
 #include "carryover.hpp"
 #include "config_assign.hpp"
-#include "configure_engine.hpp"
+#include "game_initialization/configure_engine.hpp"
 #include "dialogs.hpp" //FIXME: get rid of this as soon as the two remaining dialogs are moved to gui2
 #include "format_time_summary.hpp"
 #include "formula_string_utils.hpp"

src/tests/gui/test_gui2.cpp

@@ -74,7 +74,7 @@
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 #include "language.hpp"
-#include "create_engine.hpp"
+#include "game_initialization/create_engine.hpp"
 #include "tests/utils/fake_display.hpp"
 #include "saved_game.hpp"
 #include "video.hpp"

src/tests/test_mp_connect.cpp

@@ -18,8 +18,8 @@
 
 #include "game_config_manager.hpp"
 #include "game_display.hpp"
-#include "multiplayer_connect.hpp"
-#include "multiplayer_ui.hpp"
+#include "game_initialization/multiplayer_connect.hpp"
+#include "game_initialization/multiplayer_ui.hpp"
 #include "hotkey/hotkey_manager.hpp"
 #include "saved_game.hpp"
 

src/tests/utils/game_config_manager.cpp

@@ -28,7 +28,6 @@
 #include "hotkey/hotkey_command.hpp"
 #include "hotkey/hotkey_item.hpp"
 #include "language.hpp"
-#include "playcampaign.hpp"
 #include "unit_types.hpp"
 
 #include "gui/widgets/helper.hpp"

src/tests/utils/play_scenario.cpp

@@ -21,7 +21,7 @@
 #include "config_assign.hpp"
 #include "game_display.hpp"
 #include "saved_game.hpp"
-#include "playcampaign.hpp"
+#include "game_initialization/playcampaign.hpp"
 #include "unit.hpp"
 #include "unit_map.hpp"