diff options
Diffstat (limited to 'src/openvic-simulation/GameManager.hpp')
| -rw-r--r-- | src/openvic-simulation/GameManager.hpp | 39 |
1 files changed, 15 insertions, 24 deletions
diff --git a/src/openvic-simulation/GameManager.hpp b/src/openvic-simulation/GameManager.hpp index cd86716..ed17c30 100644 --- a/src/openvic-simulation/GameManager.hpp +++ b/src/openvic-simulation/GameManager.hpp @@ -1,6 +1,6 @@ #pragma once -#include "openvic-simulation/GameAdvancementHook.hpp" +#include "openvic-simulation/misc/GameAdvancementHook.hpp" #include "openvic-simulation/misc/Modifier.hpp" #include "openvic-simulation/country/Country.hpp" #include "openvic-simulation/economy/EconomyManager.hpp" @@ -10,23 +10,26 @@ #include "openvic-simulation/military/MilitaryManager.hpp" #include "openvic-simulation/misc/Define.hpp" #include "openvic-simulation/politics/PoliticsManager.hpp" +#include "openvic-simulation/pop/Pop.hpp" +#include "openvic-simulation/tech/Technology.hpp" namespace OpenVic { struct GameManager { 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); + TechnologyManager PROPERTY_REF(technology_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 +44,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); |