Added fade out around map change

Also moved script system first in the loop so that the camera can catch up before rendering. Also added a map change from map 2 back to map 1.

1 files changed, 8 insertions, 2 deletions

@@ -56,6 +56,12 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
       game_.loadMap(filename, warpPoint);
     });
 
+  engine_.set_function(
+    "setFadeoutProgress",
+    [&] (double val) {
+      game_.setFadeoutProgress(val);
+    });
+
   engine_.script_file("../res/scripts/common.lua");
 }
 
@@ -64,7 +70,7 @@ void ScriptSystem::tick(double dt) {
     auto result = (*callable_)(dt);
     if (!result.valid()) {
       sol::error e = result;
-      throw std::runtime_error(e.what());
+      throw e;
     }
 
     if (!*callable_) {
@@ -90,7 +96,7 @@ void ScriptSystem::runScript(std::string name) {
   auto result = (*callable_)();
   if (!result.valid()) {
     sol::error e = result;
-    throw std::runtime_error(e.what());
+    throw e;
   }
 
   if (!*callable_) {