From 05ee221cd31a782b699cc6d62e0d275364cfd7cc Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Wed, 10 Feb 2021 19:57:23 -0500 Subject: Player is no longer controllable during map transitions --- res/scripts/common.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'res/scripts/common.lua') diff --git a/res/scripts/common.lua b/res/scripts/common.lua index 23c07cc..1841662 100644 --- a/res/scripts/common.lua +++ b/res/scripts/common.lua @@ -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 -- cgit 1.4.1