Script choice no longer crashing
@@ -52,7 +52,10 @@ SCRIPT_CMD script_cmds[] = {
{Script_IncFlag_b, 2}, // 0x22
{Script_DecFlag_b, 2}, // 0x23
{Script_SetFlagValue_b, 3}, // 0x24
- {Script_IfValue_b, 6} // 0x25
+ {Script_IfValue_b, 6}, // 0x25
+ {Script_IfInput_b, 3}, // 0x26
+ {Script_Choice_b, 2} // 0x26
+
};
UBYTE ScriptLastFnComplete();
@@ -144,6 +147,11 @@ UBYTE ScriptLastFnComplete()
return TRUE;
}
+ if (last_fn == Script_Choice_b && UIIsClosed())
+ {
+ return TRUE;
+ }
+
if (last_fn == Script_OverlayMoveTo_b && UIAtDest())
{
return TRUE;
