diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-10 19:57:23 -0500 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-10 19:57:23 -0500 |
| commit | 05ee221cd31a782b699cc6d62e0d275364cfd7cc (patch) | |
| tree | 4ee6c769fd65ae38edc117f02e98455b43bfd677 /src/script_system.cpp | |
| parent | 213203fbe3352e084c8875acfbf435a948824c08 (diff) | |
| download | tanetane-05ee221cd31a782b699cc6d62e0d275364cfd7cc.tar.gz tanetane-05ee221cd31a782b699cc6d62e0d275364cfd7cc.tar.bz2 tanetane-05ee221cd31a782b699cc6d62e0d275364cfd7cc.zip | |
Player is no longer controllable during map transitions
Diffstat (limited to 'src/script_system.cpp')
| -rw-r--r-- | src/script_system.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
| diff --git a/src/script_system.cpp b/src/script_system.cpp index e388c6e..8fd5028 100644 --- a/src/script_system.cpp +++ b/src/script_system.cpp | |||
| @@ -15,7 +15,8 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) { | |||
| 15 | "sprite", | 15 | "sprite", |
| 16 | "dir", &Sprite::dir, | 16 | "dir", &Sprite::dir, |
| 17 | "followers", &Sprite::followers, | 17 | "followers", &Sprite::followers, |
| 18 | "characterState", &Sprite::characterState); | 18 | "characterState", &Sprite::characterState, |
| 19 | "controllable", &Sprite::controllable); | ||
| 19 | 20 | ||
| 20 | engine_.new_usertype<MessageSystem>( | 21 | engine_.new_usertype<MessageSystem>( |
| 21 | "message", | 22 | "message", |
| @@ -69,11 +70,11 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) { | |||
| 69 | }); | 70 | }); |
| 70 | 71 | ||
| 71 | engine_.set_function( | 72 | engine_.set_function( |
| 72 | "getControllableSprite", | 73 | "getPlayerSprite", |
| 73 | [&] () -> int { | 74 | [&] () -> int { |
| 74 | for (int id : game_.getSprites()) { | 75 | for (int id : game_.getSprites()) { |
| 75 | Sprite& sprite = game_.getSprite(id); | 76 | Sprite& sprite = game_.getSprite(id); |
| 76 | if (sprite.controllable) { | 77 | if (sprite.player) { |
| 77 | return id; | 78 | return id; |
| 78 | } | 79 | } |
| 79 | } | 80 | } |