2 files changed, 16 insertions, 6 deletions

@@ -201,7 +201,6 @@ void ScriptSystem::tick(double dt) {
 
     if (!*callable_) {
       callable_.reset();
-      runner_.reset();
     }
   }
 }
@@ -212,8 +211,7 @@ void ScriptSystem::runScript(std::string mapName, std::string scriptName) {
     loadedScripts_.insert(mapName);
   }
 
-  runner_.reset(new sol::thread(sol::thread::create(engine_.lua_state())));
-  callable_.reset(new sol::coroutine(runner_->state().traverse_get<sol::function>(mapName, scriptName)));
+  callable_.reset(new sol::coroutine(engine_.traverse_get<sol::function>(mapName, scriptName)));
 
   if (!*callable_) {
     throw std::runtime_error("Error running script: " + mapName + "." + scriptName);
@@ -227,14 +225,27 @@ void ScriptSystem::runScript(std::string mapName, std::string scriptName) {
 
   if (!*callable_) {
     callable_.reset();
-    runner_.reset();
   }
 }
 
 void ScriptSystem::runDebugScript(std::string script) {
-  auto result = engine_.script(script);
+  sol::load_result loaded_script = engine_.load(script);
+
+  callable_.reset(new sol::coroutine(loaded_script));
+
+  if (!*callable_) {
+    std::cout << "Error running debug command: " << script << std::endl;
+    return;
+  }
+
+  auto result = (*callable_)();
   if (!result.valid()) {
     sol::error e = result;
     std::cout << e.what() << std::endl;
+    return;
+  }
+
+  if (!*callable_) {
+    callable_.reset();
   }
 }
@@ -26,7 +26,6 @@ private:
 
   Game& game_;
   sol::state engine_;
-  std::unique_ptr<sol::thread> runner_;
   std::unique_ptr<sol::coroutine> callable_;
   std::set<std::string> loadedScripts_;
 };