Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unfreeze follower object during lockall (if safe movement flag set).

Browse Source 
MSGBOX_SIGN no longer freezes follower.
This commit is contained in:
Ariel A 2022-06-23 22:13:21 -04:00
parent 9e2057a9d4
commit 01335fa453
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/scripts/std_msgbox.inc
View File

@ -8,11 +8,13 @@ Std_MsgboxNPC:
return
Std_MsgboxSign:
setflag FLAG_SAFE_FOLLOWER_MOVEMENT
lockall
message NULL
waitmessage
waitbuttonpress
releaseall
clearflag FLAG_SAFE_FOLLOWER_MOVEMENT
return
Std_MsgboxDefault:

3
src/scrcmd.c
View File

@ -1248,8 +1248,11 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx)
}
else
{
struct ObjectEvent *followerObj = GetFollowerObject();
FreezeObjects_WaitForPlayer();
SetupNativeScript(ctx, IsFreezePlayerFinished);
if (FlagGet(FLAG_SAFE_FOLLOWER_MOVEMENT) && followerObj) // Unfreeze follower object (conditionally)
UnfreezeObjectEvent(followerObj);
return TRUE;
}
}