3 files changed, 22 insertions, 2 deletions

@@ -3,6 +3,7 @@
 #include "animation_system.h"
 #include "character_system.h"
 #include "camera_system.h"
+#include "script_system.h"
 
 int Game::emplaceSprite(std::string alias) {
   int id;
@@ -84,4 +85,9 @@ void Game::loadMap(std::string filename) {
     getSystem<TransformSystem>().setUpCollision(spriteId, {0, 0}, t.size, false);
     getSprite(spriteId).walkthroughScript = t.script;
   }
+
+  // Run the map's init script.
+  if (getSystem<ScriptSystem>().mapHasScript(map_->getName(), "init")) {
+    getSystem<ScriptSystem>().runScript(map_->getName(), "init");
+  }
 }
@@ -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);
@@ -19,12 +19,16 @@ public:
 
   void tick(double dt) override;
 
+  bool mapHasScript(std::string mapName, std::string scriptName);
+
   void runScript(std::string mapName, std::string scriptName);
 
   void runDebugScript(std::string script);
 
 private:
 
+  void loadMapScripts(std::string mapName);
+
   struct Script {
     std::unique_ptr<sol::thread> runner;
     std::unique_ptr<sol::coroutine> callable;