From 05ee221cd31a782b699cc6d62e0d275364cfd7cc Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Wed, 10 Feb 2021 19:57:23 -0500
Subject: Player is no longer controllable during map transitions

---
 src/script_system.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/script_system.cpp')

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) {
     "sprite",
     "dir", &Sprite::dir,
     "followers", &Sprite::followers,
-    "characterState", &Sprite::characterState);
+    "characterState", &Sprite::characterState,
+    "controllable", &Sprite::controllable);
 
   engine_.new_usertype<MessageSystem>(
     "message",
@@ -69,11 +70,11 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     });
 
   engine_.set_function(
-    "getControllableSprite",
+    "getPlayerSprite",
     [&] () -> int {
       for (int id : game_.getSprites()) {
         Sprite& sprite = game_.getSprite(id);
-        if (sprite.controllable) {
+        if (sprite.player) {
           return id;
         }
       }
-- 
cgit 1.4.1