gamestate: move old state to new folder

libopenage/engine.cpp

@@ -13,8 +13,8 @@
 #include "config.h"
 #include "error/error.h"
 #include "error/gl_debug.h"
-#include "gamestate/game_main.h"
-#include "gamestate/generator.h"
+#include "gamestate/old/game_main.h"
+#include "gamestate/old/generator.h"
 #include "gui/gui.h"
 #include "log/log.h"
 #include "renderer/font/font.h"

libopenage/game_control.cpp

@@ -4,7 +4,7 @@
 
 #include "engine.h"
 #include "error/error.h"
-#include "gamestate/game_spec.h"
+#include "gamestate/old/game_spec.h"
 #include "log/log.h"
 #include "terrain/terrain_chunk.h"
 #include "util/strings.h"

libopenage/game_control.h

@@ -9,7 +9,7 @@
 #include "coord/pixel.h"
 #include "input/input_context.h"
 #include "rng/rng.h"
-#include "gamestate/game_main.h"
+#include "gamestate/old/game_main.h"
 #include "unit/command.h"
 #include "unit/selection.h"
 #include "unit/unit_type.h"

libopenage/game_renderer.cpp

@@ -9,8 +9,8 @@
 #include "console/console.h"
 #include "engine.h"
 #include "gamedata/color.gen.h"
-#include "gamestate/game_main.h"
-#include "gamestate/game_spec.h"
+#include "gamestate/old/game_main.h"
+#include "gamestate/old/game_spec.h"
 #include "input/input_manager.h"
 #include "log/log.h"
 #include "terrain/terrain.h"

libopenage/gamestate/CMakeLists.txt

@@ -1,14 +1,12 @@
 add_sources(libopenage
-	civilisation.cpp
-	cost.cpp
-	game_main.cpp
-	game_save.cpp
-	game_spec.cpp
-	generator.cpp
-	market.cpp
+	entity.cpp
+	game.cpp
 	player.cpp
-	population_tracker.cpp
-	score.cpp
-	team.cpp
-	resource.cpp
+	terrain.cpp
+	terrain_chunk.cpp
+	types.cpp
+	world.cpp
 )
+
+# TODO: remove once migration is done.
+add_subdirectory(old/)

libopenage/gamestate/entity.cpp

@@ -0,0 +1,7 @@
+// Copyright 2018-2018 the openage authors. See copying.md for legal info.
+
+#include "entity.h"
+
+namespace openage::gamestate {
+
+} // openage

libopenage/gamestate/entity.h

@@ -0,0 +1,11 @@
+// Copyright 2018-2018 the openage authors. See copying.md for legal info.
+
+#pragma once
+
+namespace openage::gamestate {
+
+class Entity {
+
+};
+
+} // openage

libopenage/gamestate/game.cpp

@@ -0,0 +1,8 @@
+// Copyright 2018-2018 the openage authors. See copying.md for legal info.
+
+#include "game.h"
+
+namespace openage::gamestate {
+
+
+} // openage::gamestate

libopenage/gamestate/game.h

@@ -0,0 +1,14 @@
+// Copyright 2018-2018 the openage authors. See copying.md for legal info.
+
+#pragma once
+
+#include "world.h"
+
+namespace openage::gamestate {
+
+class Game {
+public:
+	World world;
+};
+
+} // openage

libopenage/gamestate/old/CMakeLists.txt

@@ -0,0 +1,14 @@
+add_sources(libopenage
+	civilisation.cpp
+	cost.cpp
+	game_main.cpp
+	game_save.cpp
+	game_spec.cpp
+	generator.cpp
+	market.cpp
+	player.cpp
+	population_tracker.cpp
+	score.cpp
+	team.cpp
+	resource.cpp
+)

libopenage/gamestate/civilisation.cpp → libopenage/gamestate/old/civilisation.cpp

@@ -1,9 +1,9 @@
-// Copyright 2015-2017 the openage authors. See copying.md for legal info.
+// Copyright 2015-2018 the openage authors. See copying.md for legal info.
 
 #include "civilisation.h"
 
-#include "../log/log.h"
-#include "../unit/unit_type.h"
+#include "../../log/log.h"
+#include "../../unit/unit_type.h"
 
 
 namespace openage {

libopenage/gamestate/game_main.cpp → libopenage/gamestate/old/game_main.cpp

@@ -1,11 +1,11 @@
-// Copyright 2014-2017 the openage authors. See copying.md for legal info.
+// Copyright 2014-2018 the openage authors. See copying.md for legal info.
 
 #include "game_main.h"
 
-#include "../engine.h"
-#include "../log/log.h"
-#include "../terrain/terrain.h"
-#include "../unit/unit_type.h"
+#include "../../engine.h"
+#include "../../log/log.h"
+#include "../../terrain/terrain.h"
+#include "../../unit/unit_type.h"
 #include "game_spec.h"
 #include "generator.h"
 

libopenage/gamestate/game_main.h → libopenage/gamestate/old/game_main.h

@@ -11,10 +11,10 @@
 #include "market.h"
 #include "player.h"
 #include "team.h"
-#include "../options.h"
-#include "../terrain/terrain.h"
-#include "../unit/unit_container.h"
-#include "../util/timing.h"
+#include "../../options.h"
+#include "../../terrain/terrain.h"
+#include "../../unit/unit_container.h"
+#include "../../util/timing.h"
 
 
 namespace openage {

libopenage/gamestate/game_save.cpp → libopenage/gamestate/old/game_save.cpp

@@ -5,11 +5,11 @@
 #include <fstream>
 #include <vector>
 
-#include "../log/log.h"
-#include "../terrain/terrain_chunk.h"
-#include "../unit/producer.h"
-#include "../unit/unit.h"
-#include "../unit/unit_type.h"
+#include "../../log/log.h"
+#include "../../terrain/terrain_chunk.h"
+#include "../../unit/producer.h"
+#include "../../unit/unit.h"
+#include "../../unit/unit_type.h"
 #include "game_main.h"
 #include "game_save.h"
 #include "game_spec.h"

libopenage/gamestate/game_spec.cpp → libopenage/gamestate/old/game_spec.cpp

@@ -1,22 +1,22 @@
-// Copyright 2015-2017 the openage authors. See copying.md for legal info.
+// Copyright 2015-2018 the openage authors. See copying.md for legal info.
 
 #include "game_spec.h"
 
 #include <tuple>
 
-#include "../assetmanager.h"
-#include "../audio/error.h"
-#include "../audio/resource_def.h"
-#include "../engine.h"
-#include "../gamedata/blending_mode.gen.h"
-#include "../gamedata/string_resource.gen.h"
-#include "../gamedata/terrain.gen.h"
-#include "../log/log.h"
-#include "../rng/global_rng.h"
-#include "../unit/producer.h"
-#include "../util/compiler.h"
-#include "../util/strings.h"
-#include "../util/timer.h"
+#include "../../assetmanager.h"
+#include "../../audio/error.h"
+#include "../../audio/resource_def.h"
+#include "../../engine.h"
+#include "../../gamedata/blending_mode.gen.h"
+#include "../../gamedata/string_resource.gen.h"
+#include "../../gamedata/terrain.gen.h"
+#include "../../log/log.h"
+#include "../../rng/global_rng.h"
+#include "../../unit/producer.h"
+#include "../../util/compiler.h"
+#include "../../util/strings.h"
+#include "../../util/timer.h"
 #include "civilisation.h"
 
 

libopenage/gamestate/game_spec.h → libopenage/gamestate/old/game_spec.h

@@ -1,13 +1,14 @@
-// Copyright 2015-2017 the openage authors. See copying.md for legal info.
+// Copyright 2015-2018 the openage authors. See copying.md for legal info.
 
 #pragma once
 
-#include "../job/job.h"
-#include "../gamedata/gamedata.gen.h"
-#include "../gamedata/graphic.gen.h"
-#include "../terrain/terrain.h"
-#include "../unit/unit_texture.h"
-#include "../util/csv.h"
+#include "../types.h"
+#include "../../job/job.h"
+#include "../../gamedata/gamedata.gen.h"
+#include "../../gamedata/graphic.gen.h"
+#include "../../terrain/terrain.h"
+#include "../../unit/unit_texture.h"
+#include "../../util/csv.h"
 
 #include <unordered_map>
 #include <memory>
@@ -23,12 +24,6 @@ class UnitTypeMeta;
 class Player;
 
 
-/**
- * the key type mapped to data objects
- */
-using index_t = int;
-
-
 /**
  * could use unique ptr
  */

libopenage/gamestate/generator.cpp → libopenage/gamestate/old/generator.cpp

@@ -2,11 +2,11 @@
 
 #include "generator.h"
 
-#include "../log/log.h"
-#include "../rng/rng.h"
-#include "../terrain/terrain_chunk.h"
-#include "../unit/unit.h"
-#include "../util/math_constants.h"
+#include "../../log/log.h"
+#include "../../rng/rng.h"
+#include "../../terrain/terrain_chunk.h"
+#include "../../unit/unit.h"
+#include "../../util/math_constants.h"
 #include "game_main.h"
 #include "game_save.h"
 #include "game_spec.h"

libopenage/gamestate/generator.h → libopenage/gamestate/old/generator.h

@@ -4,8 +4,8 @@
 
 #include <unordered_set>
 
-#include "../coord/tile.h"
-#include "../gui/guisys/public/gui_property_map.h"
+#include "../../coord/tile.h"
+#include "../../gui/guisys/public/gui_property_map.h"
 
 namespace qtsdl {
 class GuiItemLink;