diff options
| author |   zaaarf <80046572+zaaarf@users.noreply.github.com> | 2024-01-07 23:51:06 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-01-07 23:51:06 +0100 |
| commit | 79b8b73304753fedab822e6aa859fa15673f52cc (patch) | |
| tree | cb25cfb89f8b06fc34f5c906e658a1b322120089 /src/openvic-simulation/GameManager.hpp | |
| parent | 400469f08f10ffd044d9948c3f0db340c8a60db0 (diff) | |
| parent | 6f07de81a6ca430c522527958e05440d67b04937 (diff) | |
Merge pull request #111 from OpenVicProject/conditions-checking
Condition definition checking/loading
Diffstat (limited to 'src/openvic-simulation/GameManager.hpp')
| -rw-r--r-- | src/openvic-simulation/GameManager.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/openvic-simulation/GameManager.hpp b/src/openvic-simulation/GameManager.hpp index 571b4bc..66b7e57 100644 --- a/src/openvic-simulation/GameManager.hpp +++ b/src/openvic-simulation/GameManager.hpp @@ -1,6 +1,5 @@ #pragma once -#include "openvic-simulation/misc/Decision.hpp" #include "openvic-simulation/country/Country.hpp" #include "openvic-simulation/diplomacy/DiplomacyManager.hpp" #include "openvic-simulation/economy/EconomyManager.hpp" @@ -9,14 +8,15 @@ #include "openvic-simulation/map/Crime.hpp" #include "openvic-simulation/map/Map.hpp" #include "openvic-simulation/military/MilitaryManager.hpp" +#include "openvic-simulation/misc/Decision.hpp" #include "openvic-simulation/misc/Define.hpp" +#include "openvic-simulation/misc/Event.hpp" #include "openvic-simulation/misc/Modifier.hpp" #include "openvic-simulation/misc/SimulationClock.hpp" #include "openvic-simulation/politics/PoliticsManager.hpp" #include "openvic-simulation/pop/Pop.hpp" #include "openvic-simulation/research/ResearchManager.hpp" -#include "openvic-simulation/research/Technology.hpp" -#include "openvic-simulation/misc/Event.hpp" +#include "openvic-simulation/scripts/ScriptManager.hpp" namespace OpenVic { struct GameManager { @@ -38,6 +38,7 @@ namespace OpenVic { DecisionManager PROPERTY_REF(decision_manager); UIManager PROPERTY_REF(ui_manager); DiplomacyManager PROPERTY_REF(diplomacy_manager); + ScriptManager PROPERTY_REF(script_manager); SimulationClock PROPERTY_REF(simulation_clock); time_t session_start; /* SS-54, as well as allowing time-tracking */ |