1 files changed, 12 insertions, 2 deletions

@@ -206,15 +206,25 @@ void ScriptSystem::tick(double dt) {
   });
 }
 
-void ScriptSystem::runScript(std::string mapName, std::string scriptName) {
+void ScriptSystem::loadMapScripts(std::string mapName) {
   if (!loadedScripts_.count(mapName)) {
     engine_.script_file("../res/scripts/" + mapName + ".lua");
     loadedScripts_.insert(mapName);
   }
+}
+
+bool ScriptSystem::mapHasScript(std::string mapName, std::string scriptName) {
+  loadMapScripts(mapName);
+
+  return !!engine_.traverse_get<sol::function>(mapName, scriptName);
+}
+
+void ScriptSystem::runScript(std::string mapName, std::string scriptName) {
+  loadMapScripts(mapName);
 
   Script newScript;
   newScript.runner.reset(new sol::thread(sol::thread::create(engine_.lua_state())));
-  newScript.callable.reset(new sol::coroutine(engine_.traverse_get<sol::function>(mapName, scriptName)));
+  newScript.callable.reset(new sol::coroutine(newScript.runner->state().traverse_get<sol::function>(mapName, scriptName)));
 
   if (!*newScript.callable) {
     throw std::runtime_error("Error running script: " + mapName + "." + scriptName);