New pop history loading + bookmark selection by index

OpenVicProject · Dec 12, 2023 · 7f2c0c2 · 7f2c0c2
1 parent 0b3a162
commit 7f2c0c2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/extension/deps/openvic-simulation b/extension/deps/openvic-simulation
diff --git a/extension/src/openvic-extension/singletons/GameSingleton.cpp b/extension/src/openvic-extension/singletons/GameSingleton.cpp
@@ -29,7 +29,7 @@ void GameSingleton::_bind_methods() {
 	OV_BIND_METHOD(GameSingleton::load_defines_compatibility_mode, { "file_paths" });
 	OV_BIND_SMETHOD(search_for_game_path, { "hint_path" }, DEFVAL(String {}));
 
-	OV_BIND_METHOD(GameSingleton::setup_game);
+	OV_BIND_METHOD(GameSingleton::setup_game, { "bookmark_index" });
 
 	OV_BIND_METHOD(GameSingleton::get_province_index_from_uv_coords, { "coords" });
 	OV_BIND_METHOD(GameSingleton::get_province_info_from_index, { "index" });
@@ -112,15 +112,13 @@ Dataloader const& GameSingleton::get_dataloader() const {
 	return dataloader;
 }
 
-Error GameSingleton::setup_game() {
-	BookmarkManager const& bookmark_manager = game_manager.get_history_manager().get_bookmark_manager();
-	if (bookmark_manager.bookmarks_empty()) {
-		UtilityFunctions::push_error("No bookmark to load!");
+Error GameSingleton::setup_game(int32_t bookmark_index) {
+	Bookmark const* bookmark = game_manager.get_history_manager().get_bookmark_manager().get_bookmark_by_index(bookmark_index);
+	if (bookmark == nullptr) {
+		UtilityFunctions::push_error("Failed to get bookmark with index: ", bookmark_index);
 		return FAILED;
 	}
-	bool ret = game_manager.load_bookmark(&bookmark_manager.get_bookmarks().front());
-	// TODO - load pop history with the new history system
-	ret &= dataloader.load_pop_history(game_manager, "history/pops/" + game_manager.get_today().to_string());
+	bool ret = game_manager.load_bookmark(bookmark);
 	for (Province& province : game_manager.get_map().get_provinces()) {
 		province.set_crime(
 			game_manager.get_crime_manager().get_crime_modifier_by_index(

diff --git a/extension/src/openvic-extension/singletons/GameSingleton.hpp b/extension/src/openvic-extension/singletons/GameSingleton.hpp
@@ -56,9 +56,8 @@ namespace OpenVic {
 
 		static godot::String search_for_game_path(godot::String hint_path = {});
 
-		/* Post-load/restart game setup - reset the game to post-load state
-		 * and (re)generate starting data, e.g. buildings. */
-		godot::Error setup_game();
+		/* Post-load/restart game setup - reset the game to post-load state and load the specified bookmark. */
+		godot::Error setup_game(int32_t bookmark_index);
 
 		int32_t get_province_index_from_uv_coords(godot::Vector2 const& coords) const;
 

diff --git a/game/src/Game/GameSession/GameSession.gd b/game/src/Game/GameSession/GameSession.gd
@@ -4,7 +4,7 @@ extends Control
 
 func _ready():
 	Events.Options.load_settings_from_file()
-	if GameSingleton.setup_game() != OK:
+	if GameSingleton.setup_game(0) != OK:
 		push_error("Failed to setup game")
 
 func _process(_delta : float):
+20 −0		.vscode/launch.json
+4 −0		build_scons_and_execute_windows.bat
+1 −0		delete_obj_files_windows.bat
+1 −1		deps/openvic-dataloader
+46 −28		src/openvic-simulation/dataloader/Dataloader.cpp
+2 −1		src/openvic-simulation/dataloader/Dataloader.hpp
+10 −0		src/openvic-simulation/history/Bookmark.cpp
+2 −0		src/openvic-simulation/history/Bookmark.hpp
+65 −17		src/openvic-simulation/history/CountryHistory.cpp
+3 −3		src/openvic-simulation/history/CountryHistory.hpp
+2 −2		src/openvic-simulation/history/HistoryMap.cpp
+30 −18		src/openvic-simulation/history/HistoryMap.hpp
+54 −11		src/openvic-simulation/history/ProvinceHistory.cpp
+9 −0		src/openvic-simulation/history/ProvinceHistory.hpp
+1 −1		src/openvic-simulation/interface/UI.hpp
+7 −0		src/openvic-simulation/map/Map.cpp
+13 −8		src/openvic-simulation/map/Province.cpp
+1 −1		src/openvic-simulation/map/Province.hpp
+2 −2		src/openvic-simulation/misc/Decision.cpp
+6 −0		src/openvic-simulation/politics/Government.cpp
+2 −0		src/openvic-simulation/politics/Government.hpp
+20 −13		src/openvic-simulation/pop/Pop.cpp
+14 −3		src/openvic-simulation/pop/Pop.hpp