From 5ecd0f428dd8292a17c5013c525a4f5d3967acb8 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Fri, 12 Feb 2021 00:33:19 -0500 Subject: Scripts are organised per-map now --- src/script_system.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/script_system.cpp') diff --git a/src/script_system.cpp b/src/script_system.cpp index 21d4090..5b9b987 100644 --- a/src/script_system.cpp +++ b/src/script_system.cpp @@ -120,17 +120,17 @@ void ScriptSystem::tick(double dt) { } } -void ScriptSystem::runScript(std::string name) { - if (!loadedScripts_.count(name)) { - engine_.script_file("../res/scripts/" + name + ".lua"); - loadedScripts_.insert(name); +void ScriptSystem::runScript(std::string mapName, std::string scriptName) { + if (!loadedScripts_.count(mapName)) { + engine_.script_file("../res/scripts/" + mapName + ".lua"); + loadedScripts_.insert(mapName); } runner_.reset(new sol::thread(sol::thread::create(engine_.lua_state()))); - callable_.reset(new sol::coroutine(runner_->state().get(name))); + callable_.reset(new sol::coroutine(runner_->state().traverse_get(mapName, scriptName))); if (!*callable_) { - throw std::runtime_error("Error running script: " + name); + throw std::runtime_error("Error running script: " + mapName + "." + scriptName); } auto result = (*callable_)(); -- cgit 1.4.1