aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/GameManager.hpp
diff options
context:
space:
mode:
author zaaarf <zaaarf@proton.me>2023-12-01 20:03:03 +0100
committer zaaarf <zaaarf@proton.me>2023-12-01 20:03:03 +0100
commit2d76e0766f0d65ffd8c9eb19eaec705445f91af0 (patch)
treea3ba37c2d652b95085ac8cf72a25941da26498ad /src/openvic-simulation/GameManager.hpp
parenta54898b7770e0d66b729216173960686c67e58bb (diff)
feat: replaced REF_GETTERS with PROPERTY_REF, added PROPERTY_CUSTOM_PREFIX
Diffstat (limited to 'src/openvic-simulation/GameManager.hpp')
-rw-r--r--src/openvic-simulation/GameManager.hpp34
1 files changed, 11 insertions, 23 deletions
diff --git a/src/openvic-simulation/GameManager.hpp b/src/openvic-simulation/GameManager.hpp
index cd86716..5b66c8b 100644
--- a/src/openvic-simulation/GameManager.hpp
+++ b/src/openvic-simulation/GameManager.hpp
@@ -16,17 +16,17 @@ namespace OpenVic {
using state_updated_func_t = std::function<void()>;
private:
- Map map;
- DefineManager define_manager;
- EconomyManager economy_manager;
- MilitaryManager military_manager;
- ModifierManager modifier_manager;
- PoliticsManager politics_manager;
- HistoryManager history_manager;
- PopManager pop_manager;
- CountryManager country_manager;
- UIManager ui_manager;
- GameAdvancementHook clock;
+ Map PROPERTY_REF(map);
+ DefineManager PROPERTY_REF(define_manager);
+ EconomyManager PROPERTY_REF(economy_manager);
+ MilitaryManager PROPERTY_REF(military_manager);
+ ModifierManager PROPERTY_REF(modifier_manager);
+ PoliticsManager PROPERTY_REF(politics_manager);
+ HistoryManager PROPERTY_REF(history_manager);
+ PopManager PROPERTY_REF(pop_manager);
+ CountryManager PROPERTY_REF(country_manager);
+ UIManager PROPERTY_REF(ui_manager);
+ GameAdvancementHook PROPERTY_REF(clock);
time_t session_start; /* SS-54, as well as allowing time-tracking */
Bookmark const* PROPERTY(bookmark);
@@ -41,18 +41,6 @@ namespace OpenVic {
public:
GameManager(state_updated_func_t state_updated_callback);
- REF_GETTERS(map)
- REF_GETTERS(define_manager)
- REF_GETTERS(economy_manager)
- REF_GETTERS(military_manager)
- REF_GETTERS(modifier_manager)
- REF_GETTERS(politics_manager)
- REF_GETTERS(history_manager)
- REF_GETTERS(pop_manager)
- REF_GETTERS(country_manager)
- REF_GETTERS(ui_manager)
- REF_GETTERS(clock)
-
bool reset();
bool load_bookmark(Bookmark const* new_bookmark);