diff options
Diffstat (limited to 'src/script_system.cpp')
| -rw-r--r-- | src/script_system.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
| diff --git a/src/script_system.cpp b/src/script_system.cpp index 6e38905..a5e9403 100644 --- a/src/script_system.cpp +++ b/src/script_system.cpp | |||
| @@ -56,6 +56,12 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) { | |||
| 56 | game_.loadMap(filename, warpPoint); | 56 | game_.loadMap(filename, warpPoint); |
| 57 | }); | 57 | }); |
| 58 | 58 | ||
| 59 | engine_.set_function( | ||
| 60 | "setFadeoutProgress", | ||
| 61 | [&] (double val) { | ||
| 62 | game_.setFadeoutProgress(val); | ||
| 63 | }); | ||
| 64 | |||
| 59 | engine_.script_file("../res/scripts/common.lua"); | 65 | engine_.script_file("../res/scripts/common.lua"); |
| 60 | } | 66 | } |
| 61 | 67 | ||
| @@ -64,7 +70,7 @@ void ScriptSystem::tick(double dt) { | |||
| 64 | auto result = (*callable_)(dt); | 70 | auto result = (*callable_)(dt); |
| 65 | if (!result.valid()) { | 71 | if (!result.valid()) { |
| 66 | sol::error e = result; | 72 | sol::error e = result; |
| 67 | throw std::runtime_error(e.what()); | 73 | throw e; |
| 68 | } | 74 | } |
| 69 | 75 | ||
| 70 | if (!*callable_) { | 76 | if (!*callable_) { |
| @@ -90,7 +96,7 @@ void ScriptSystem::runScript(std::string name) { | |||
| 90 | auto result = (*callable_)(); | 96 | auto result = (*callable_)(); |
| 91 | if (!result.valid()) { | 97 | if (!result.valid()) { |
| 92 | sol::error e = result; | 98 | sol::error e = result; |
| 93 | throw std::runtime_error(e.what()); | 99 | throw e; |
| 94 | } | 100 | } |
| 95 | 101 | ||
| 96 | if (!*callable_) { | 102 | if (!*callable_) { |
