diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-06-13 18:59:47 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-06-13 18:59:47 +0200 |
| commit | bfd539513af435564daf70f94f6cce146dd5c948 (patch) | |
| tree | 7ba5a06714c267185dd3a59aabc6556a105c122f /src/openvic-simulation/scripts/ConditionScript.cpp | |
| parent | 01a8f60aaca9784d814f4cb35a3fc4be86e1dd20 (diff) | |
| parent | 4b39e77304094708d5c503b6a221386408cc4409 (diff) | |
Merge pull request #165 from OpenVicProject/instance-definition-managers
Separated GameManager into Definition and Instance Managers
Diffstat (limited to 'src/openvic-simulation/scripts/ConditionScript.cpp')
| -rw-r--r-- | src/openvic-simulation/scripts/ConditionScript.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openvic-simulation/scripts/ConditionScript.cpp b/src/openvic-simulation/scripts/ConditionScript.cpp index 368054b..bee4d07 100644 --- a/src/openvic-simulation/scripts/ConditionScript.cpp +++ b/src/openvic-simulation/scripts/ConditionScript.cpp @@ -1,6 +1,6 @@ #include "ConditionScript.hpp" -#include "openvic-simulation/GameManager.hpp" +#include "openvic-simulation/DefinitionManager.hpp" using namespace OpenVic; using namespace OpenVic::NodeTools; @@ -9,9 +9,9 @@ ConditionScript::ConditionScript( scope_t new_initial_scope, scope_t new_this_scope, scope_t new_from_scope ) : initial_scope { new_initial_scope }, this_scope { new_this_scope }, from_scope { new_from_scope } {} -bool ConditionScript::_parse_script(ast::NodeCPtr root, GameManager const& game_manager) { - return game_manager.get_script_manager().get_condition_manager().expect_condition_script( - game_manager, +bool ConditionScript::_parse_script(ast::NodeCPtr root, DefinitionManager const& definition_manager) { + return definition_manager.get_script_manager().get_condition_manager().expect_condition_script( + definition_manager, initial_scope, this_scope, from_scope, |