5 files changed, 12 insertions, 6 deletions

@@ -86,19 +86,22 @@ function SetPartyDirection(spriteId, direction)
 end
 
 function ChangeMap(map, warp)
-  local playerId = getControllableSprite()
+  local playerId = getPlayerSprite()
   local playerSprite = getSprite(playerId)
   local direction = playerSprite.dir
   local oldState = playerSprite.characterState
 
+  playerSprite.controllable = false
   FadeToBlack(150)
   loadMap("../res/maps/" .. map .. ".tmx", warp, direction)
 
-  local newPlayerId = getControllableSprite()
+  local newPlayerId = getPlayerSprite()
+  local newPlayerSprite = getSprite(newPlayerId)
   if oldState == CharacterState.RUNNING then
     character():startRunning(newPlayerId)
   end
 
   coroutine.yield()
   RemoveFadeout(150)
+  newPlayerSprite.controllable = true
 end
@@ -34,7 +34,7 @@ void Game::loadMap(std::string filename, std::string warpPoint, Direction dir) {
   getSystem<TransformSystem>().setUpCollision(lucasSprite, {-8, -8}, {12, 8}, true);
   getSystem<AnimationSystem>().initSprite(lucasSprite, "../res/sprites/lucas_anim.txt");
   getSystem<AnimationSystem>().setSpriteDirection(lucasSprite, dir);
-  getSprite(lucasSprite).controllable = true;
+  getSprite(lucasSprite).player = true;
   getSystem<CharacterSystem>().initSprite(lucasSprite);
 
   int kumaSprite = emplaceSprite("kuma");
@@ -23,6 +23,7 @@ void loop(Renderer& renderer) {
   game.emplaceSystem<MessageSystem>();
 
   game.loadMap("../res/maps/map1.tmx", "spawn", Direction::down);
+  game.getSprite(game.getSpriteByAlias("lucas")).controllable = true;
 
   renderer.render(game);
 
@@ -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;
         }
       }
@@ -61,6 +61,7 @@ public:
 
   // Input
   bool controllable = false;
+  bool player = false;
 };
 
 #endif /* end of include guard: SPRITE_H_70503825 */