diff options
author | George L. Albany <Megacake1234@gmail.com> | 2023-10-13 17:13:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-13 17:13:27 +0200 |
commit | 17847e16e14ec52eb48a6fd0d9dc36ee93e457db (patch) | |
tree | 01e8f55c5327ee3b0796bb1d1e6e616331abee13 /src/openvic-simulation/dataloader/Dataloader.cpp | |
parent | 32fdf7c38b2e56339a2fffa71a7a61a854759e2c (diff) | |
parent | a93b0d8f268fbf04c09ee73e5b2923a610667fcf (diff) |
Merge pull request #46 from OpenVicProject/add/bookmark-loading
Diffstat (limited to 'src/openvic-simulation/dataloader/Dataloader.cpp')
-rw-r--r-- | src/openvic-simulation/dataloader/Dataloader.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/openvic-simulation/dataloader/Dataloader.cpp b/src/openvic-simulation/dataloader/Dataloader.cpp index 718218f..b9d7496 100644 --- a/src/openvic-simulation/dataloader/Dataloader.cpp +++ b/src/openvic-simulation/dataloader/Dataloader.cpp @@ -595,6 +595,7 @@ bool Dataloader::load_defines(GameManager& game_manager) const { static const fs::path issues_file = "common/issues.txt"; static const fs::path production_types_file = "common/production_types.txt"; static const fs::path religion_file = "common/religion.txt"; + static const fs::path bookmark_file = "common/bookmarks.txt"; bool ret = true; @@ -662,6 +663,10 @@ bool Dataloader::load_defines(GameManager& game_manager) const { Logger::error("Failed to load units!"); ret = false; } + if (!game_manager.get_history_manager().load_bookmark_file(parse_defines(lookup_file(bookmark_file)).get_file_node())) { + Logger::error("Failed to load bookmarks!"); + ret = false; + } return ret; } |