rename gamestatus.?pp -> game_data.?pp, b/c of content changes

projectfiles/CodeBlocks/wesnoth.cbp

@@ -339,6 +339,8 @@
 		<Unit filename="..\..\src\game_config_manager.hpp" />
 		<Unit filename="..\..\src\game_controller.cpp" />
 		<Unit filename="..\..\src\game_controller.hpp" />
+		<Unit filename="..\..\src\game_data.cpp" />
+		<Unit filename="..\..\src\game_data.hpp" />
 		<Unit filename="..\..\src\game_display.cpp" />
 		<Unit filename="..\..\src\game_display.hpp" />
 		<Unit filename="..\..\src\game_end_exceptions.cpp" />
@@ -362,8 +364,6 @@
 		<Unit filename="..\..\src\game_preferences.cpp" />
 		<Unit filename="..\..\src\game_preferences.hpp" />
 		<Unit filename="..\..\src\game_preferences_display.cpp" />
-		<Unit filename="..\..\src\gamestatus.cpp" />
-		<Unit filename="..\..\src\gamestatus.hpp" />
 		<Unit filename="..\..\src\generators\cavegen.cpp" />
 		<Unit filename="..\..\src\generators\cavegen.hpp" />
 		<Unit filename="..\..\src\generators\map_create.cpp" />

projectfiles/VC9/wesnoth.vcproj

@@ -20296,6 +20296,14 @@
 			RelativePath="..\..\src\game_controller.hpp"
 			>
 		</File>
+		<File
+			RelativePath="..\..\src\game_data.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\game_data.hpp"
+			>
+		</File>
 		<File
 			RelativePath="..\..\src\game_display.cpp"
 			>
@@ -20332,14 +20340,6 @@
 			RelativePath="..\..\src\game_preferences_display.cpp"
 			>
 		</File>
-		<File
-			RelativePath="..\..\src\gamestatus.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\gamestatus.hpp"
-			>
-		</File>
 		<File
 			RelativePath="..\..\src\generic_event.cpp"
 			>

src/CMakeLists.txt

@@ -743,6 +743,7 @@ set(wesnoth-main_SRC
 	game_classification.cpp
 	game_config_manager.cpp
 	game_controller.cpp
+	game_data.cpp
 	game_display.cpp
 	game_errors.cpp
 	game_events/action_wml.cpp
@@ -754,7 +755,6 @@ set(wesnoth-main_SRC
 	game_events/wmi_container.cpp
 	game_preferences.cpp
 	game_preferences_display.cpp
-	gamestatus.cpp
 	generic_event.cpp
 	gui/auxiliary/canvas.cpp
 	gui/auxiliary/log.cpp

src/SConscript

@@ -276,6 +276,7 @@ wesnoth_sources = Split("""
     game_classification.cpp
     game_config_manager.cpp
     game_controller.cpp
+    game_data.cpp
     game_display.cpp
     game_errors.cpp
     game_events/action_wml.cpp
@@ -286,7 +287,6 @@ wesnoth_sources = Split("""
     game_events/pump.cpp
     game_events/wmi_container.cpp
     game_preferences.cpp
-    gamestatus.cpp
     gui/auxiliary/canvas.cpp
     gui/auxiliary/event/dispatcher.cpp
     gui/auxiliary/event/distributor.cpp

src/actions/attack.cpp

@@ -29,7 +29,7 @@
 #include "../game_display.hpp"
 #include "../game_events/pump.hpp"
 #include "../game_preferences.hpp"
-#include "../gamestatus.hpp"
+#include "../game_data.hpp"
 #include "../gettext.hpp"
 #include "../log.hpp"
 #include "../map.hpp"

src/actions/create.cpp

@@ -29,7 +29,7 @@
 #include "../game_display.hpp"
 #include "../game_events/pump.hpp"
 #include "../game_preferences.hpp"
-#include "../gamestatus.hpp"
+#include "../game_data.hpp"
 #include "../gettext.hpp"
 #include "../log.hpp"
 #include "../map.hpp"

src/ai/testing/ca.cpp

@@ -25,7 +25,7 @@
 #include "../composite/stage.hpp"
 #include "../../game_board.hpp"
 #include "../../game_classification.hpp"
-#include "../../gamestatus.hpp"
+#include "../../game_data.hpp"
 #include "../../log.hpp"
 #include "../../map.hpp"
 #include "../../resources.hpp"

src/carryover.cpp

@@ -19,7 +19,7 @@
 #include "config.hpp"
 #include "team.hpp"
 #include "unit.hpp"
-#include "gamestatus.hpp"
+#include "game_data.hpp"
 #include <boost/foreach.hpp>
 #include <cassert>
 

src/game_data.cpp

@@ -19,7 +19,7 @@
 
 #include "global.hpp"
 
-#include "gamestatus.hpp"
+#include "game_data.hpp"
 
 #include "carryover.hpp"
 #include "filesystem.hpp"

src/game_events/conditional_wml.cpp

@@ -21,7 +21,7 @@
 #include "conditional_wml.hpp"
 
 #include "../config.hpp"
-#include "../gamestatus.hpp"
+#include "../game_data.hpp"
 #include "../log.hpp"
 #include "../recall_list_manager.hpp"
 #include "../resources.hpp"

src/game_events/handlers.cpp

@@ -24,7 +24,7 @@
 #include "pump.hpp"
 
 #include "../formula_string_utils.hpp"
-#include "../gamestatus.hpp"
+#include "../game_data.hpp"
 #include "../hotkey/hotkey_command.hpp"
 #include "../log.hpp"
 #include "../reports.hpp"

src/game_events/menu_item.cpp

@@ -25,7 +25,7 @@
 
 #include "../actions/undo.hpp"
 #include "../game_config.hpp"
-#include "../gamestatus.hpp"
+#include "../game_data.hpp"
 #include "../log.hpp"
 #include "../mouse_handler_base.hpp"
 #include "../play_controller.hpp"

src/game_events/pump.cpp

@@ -25,7 +25,7 @@
 
 #include "../game_config.hpp"
 #include "../game_display.hpp"
-#include "../gamestatus.hpp"
+#include "../game_data.hpp"
 #include "../gettext.hpp"
 #include "../log.hpp"
 #include "../play_controller.hpp"

src/game_events/wmi_container.cpp

@@ -23,7 +23,7 @@
 #include "menu_item.hpp"
 
 #include "../config.hpp"
-#include "../gamestatus.hpp"
+#include "../game_data.hpp"
 #include "../log.hpp"
 #include "../map_location.hpp"
 #include "../resources.hpp"

src/gui/dialogs/gamestate_inspector.cpp

@@ -31,7 +31,7 @@
 #include "serialization/parser.hpp" // for write()
 #include "utils/foreach.tpp"
 
-#include "../../gamestatus.hpp"
+#include "../../game_data.hpp"
 #include "../../recall_list_manager.hpp"
 #include "../../resources.hpp"
 #include "../../team.hpp"

src/map_label.cpp

@@ -15,7 +15,7 @@
 #include "global.hpp"
 
 #include "display.hpp"
-#include "gamestatus.hpp"
+#include "game_data.hpp"
 #include "map_label.hpp"
 #include "resources.hpp"
 #include "formula_string_utils.hpp"

src/persist_var.cpp

@@ -14,7 +14,7 @@
 
 #include "global.hpp"
 
-#include "gamestatus.hpp"
+#include "game_data.hpp"
 #include "log.hpp"
 #include "network.hpp"
 #include "persist_context.hpp"

src/play_controller.hpp

@@ -19,7 +19,7 @@
 #include "controller_base.hpp"
 #include "game_end_exceptions.hpp"
 #include "game_board.hpp"
-#include "gamestatus.hpp"
+#include "game_data.hpp"
 #include "help.hpp"
 #include "menu_events.hpp"
 #include "mouse_events.hpp"

src/replay.cpp

@@ -27,7 +27,7 @@
 #include "dialogs.hpp"
 #include "game_display.hpp"
 #include "game_preferences.hpp"
-#include "gamestatus.hpp"
+#include "game_data.hpp"
 #include "log.hpp"
 #include "map_label.hpp"
 #include "map_location.hpp"

src/scripting/lua.cpp

@@ -46,7 +46,7 @@
 #include "game_events/conditional_wml.hpp"
 #include "game_events/pump.hpp"
 #include "game_preferences.hpp"
-#include "gamestatus.hpp"
+#include "game_data.hpp"
 #include "game_config_manager.hpp"
 #include "log.hpp"
 #include "lua_jailbreak_exception.hpp"

src/storyscreen/controller.cpp

@@ -29,7 +29,7 @@
 #include "display.hpp"
 #include "game_events/action_wml.hpp"
 #include "game_events/conditional_wml.hpp"
-#include "gamestatus.hpp"
+#include "game_data.hpp"
 #include "gettext.hpp"
 #include "intro.hpp"
 #include "log.hpp"

src/storyscreen/part.cpp

@@ -24,7 +24,7 @@
 #include "storyscreen/part.hpp"
 
 #include "config.hpp"
-#include "gamestatus.hpp"
+#include "game_data.hpp"
 #include "game_events/action_wml.hpp"
 #include "game_events/conditional_wml.hpp"
 #include "image.hpp"

src/synced_commands.cpp

@@ -16,7 +16,7 @@
 #include "log.hpp"
 #include "resources.hpp"
 #include "map_location.hpp"
-#include "gamestatus.hpp"
+#include "game_data.hpp"
 #include "unit.hpp"
 #include "team.hpp"
 #include "play_controller.hpp"

src/synced_context.cpp

@@ -13,7 +13,7 @@
 #include "random_new_deterministic.hpp"
 #include "resources.hpp"
 #include "synced_checkup.hpp"
-#include "gamestatus.hpp"
+#include "game_data.hpp"
 #include "network.hpp"
 #include "log.hpp"
 #include "lua_jailbreak_exception.hpp"

src/team.cpp

@@ -22,7 +22,7 @@
 #include "ai/manager.hpp"
 #include "formula_string_utils.hpp"
 #include "game_events/pump.hpp"
-#include "gamestatus.hpp"
+#include "game_data.hpp"
 #include "map.hpp"
 #include "resources.hpp"
 #include "game_preferences.hpp"

src/tod_manager.cpp

@@ -16,7 +16,7 @@
 
 #include "display_context.hpp"
 #include "formula_string_utils.hpp"
-#include "gamestatus.hpp"
+#include "game_data.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
 #include "map.hpp"

src/variable.cpp

@@ -24,7 +24,7 @@
 #include "variable.hpp"
 
 #include "formula_string_utils.hpp"
-#include "gamestatus.hpp"
+#include "game_data.hpp"
 #include "log.hpp"
 #include "resources.hpp"
 #include "unit.hpp"