Merge pull request #111 from OpenVicProject/conditions-checking

Condition definition checking/loading

1 files changed, 14 insertions, 2 deletions

diff --git a/src/openvic-simulation/scripts/ConditionScript.cpp b/src/openvic-simulation/scripts/ConditionScript.cpp
index af2faf7..368054b 100644
--- a/src/openvic-simulation/scripts/ConditionScript.cpp
+++ b/src/openvic-simulation/scripts/ConditionScript.cpp
@@ -1,8 +1,20 @@
 #include "ConditionScript.hpp"
 
+#include "openvic-simulation/GameManager.hpp"
+
 using namespace OpenVic;
+using namespace OpenVic::NodeTools;
+
+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) {
-	// TODO - parse condition script
-	return true;
+	return game_manager.get_script_manager().get_condition_manager().expect_condition_script(
+		game_manager,
+		initial_scope,
+		this_scope,
+		from_scope,
+		move_variable_callback(condition_root)
+	)(root);
 }