2 files changed, 28 insertions, 18 deletions

@@ -192,17 +192,17 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
 void ScriptSystem::tick(double dt) {
   if (game_.isGameplayPaused()) return;
 
-  if (callable_ && *callable_) {
-    auto result = (*callable_)(dt);
+  for (Script& script : scripts_) {
+    auto result = (*script.callable)(dt);
     if (!result.valid()) {
       sol::error e = result;
       throw e;
     }
-
-    if (!*callable_) {
-      callable_.reset();
-    }
   }
+
+  scripts_.remove_if([] (const Script& script) {
+    return (!*script.callable);
+  });
 }
 
 void ScriptSystem::runScript(std::string mapName, std::string scriptName) {
@@ -211,41 +211,45 @@ void ScriptSystem::runScript(std::string mapName, std::string scriptName) {
     loadedScripts_.insert(mapName);
   }
 
-  callable_.reset(new sol::coroutine(engine_.traverse_get<sol::function>(mapName, scriptName)));
+  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)));
 
-  if (!*callable_) {
+  if (!*newScript.callable) {
     throw std::runtime_error("Error running script: " + mapName + "." + scriptName);
   }
 
-  auto result = (*callable_)();
+  auto result = (*newScript.callable)();
   if (!result.valid()) {
     sol::error e = result;
     throw e;
   }
 
-  if (!*callable_) {
-    callable_.reset();
+  if (*newScript.callable) {
+    scripts_.push_back(std::move(newScript));
   }
 }
 
 void ScriptSystem::runDebugScript(std::string script) {
-  sol::load_result loaded_script = engine_.load(script);
+  Script newScript;
+  newScript.runner.reset(new sol::thread(sol::thread::create(engine_.lua_state())));
 
-  callable_.reset(new sol::coroutine(loaded_script));
+  sol::load_result loaded_script = newScript.runner->state().load(script);
+  newScript.callable.reset(new sol::coroutine(loaded_script));
 
-  if (!*callable_) {
+  if (!*newScript.callable) {
     std::cout << "Error running debug command: " << script << std::endl;
     return;
   }
 
-  auto result = (*callable_)();
+  auto result = (*newScript.callable)();
   if (!result.valid()) {
     sol::error e = result;
     std::cout << e.what() << std::endl;
     return;
   }
 
-  if (!*callable_) {
-    callable_.reset();
+  if (*newScript.callable) {
+    scripts_.push_back(std::move(newScript));
   }
 }
@@ -4,6 +4,7 @@
 #include <sol/sol.hpp>
 #include <memory>
 #include <set>
+#include <list>
 #include <string>
 #include "system.h"
 
@@ -24,9 +25,14 @@ public:
 
 private:
 
+  struct Script {
+    std::unique_ptr<sol::thread> runner;
+    std::unique_ptr<sol::coroutine> callable;
+  };
+
   Game& game_;
   sol::state engine_;
-  std::unique_ptr<sol::coroutine> callable_;
+  std::list<Script> scripts_;
   std::set<std::string> loadedScripts_;
 };