diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-11-17 10:19:53 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-11-17 10:19:53 +0100 |
| commit | e76336cd92639f4ec71088fc4c80aea4c25528cd (patch) | |
| tree | eeed419a7d97ecb58adf63a17eb9184db3e5ed7a /src/openvic-simulation/GameManager.hpp | |
| parent | a00b558a53edb40c9e6789790036f0b618e80ec1 (diff) | |
| parent | 886b8b8f396438fc2b7da7d2508f2064d14150a8 (diff) | |
Merge pull request #75 from OpenVicProject/accumulated-changes
Accumulated changes
Diffstat (limited to 'src/openvic-simulation/GameManager.hpp')
| -rw-r--r-- | src/openvic-simulation/GameManager.hpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/openvic-simulation/GameManager.hpp b/src/openvic-simulation/GameManager.hpp index 6be2938..cd86716 100644 --- a/src/openvic-simulation/GameManager.hpp +++ b/src/openvic-simulation/GameManager.hpp @@ -1,7 +1,7 @@ #pragma once #include "openvic-simulation/GameAdvancementHook.hpp" -#include "openvic-simulation/Modifier.hpp" +#include "openvic-simulation/misc/Modifier.hpp" #include "openvic-simulation/country/Country.hpp" #include "openvic-simulation/economy/EconomyManager.hpp" #include "openvic-simulation/history/HistoryManager.hpp" @@ -29,7 +29,8 @@ namespace OpenVic { GameAdvancementHook clock; time_t session_start; /* SS-54, as well as allowing time-tracking */ - Date today; + Bookmark const* PROPERTY(bookmark); + Date PROPERTY(today); state_updated_func_t state_updated; bool needs_update; @@ -52,9 +53,9 @@ namespace OpenVic { REF_GETTERS(ui_manager) REF_GETTERS(clock) - bool setup(); + bool reset(); + bool load_bookmark(Bookmark const* new_bookmark); - Date get_today() const; bool expand_building(Province::index_t province_index, std::string_view building_type_identifier); /* Hardcoded data for defining things for which parsing from files has |