Apple-2-SW/lawless-legends
1
0
Fork 0
mirror of https://github.com/badvision/lawless-legends.git synced 2024-06-27 07:29:32 +00:00
Code Issues Projects Releases Wiki Activity

Fix null ptr bug when checking quest triggers

Browse Source
This commit is contained in:
Martin Haye 2021-10-19 07:57:14 -07:00
parent bc20789c64
commit 69d24b0b8c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Platform/Apple/virtual/src/plasma/questlog.pla
View File

@ -55,13 +55,21 @@ def displayQuest_cb3(descrip, portraitNum, map1Num, map1X, map1Y, map2Num, map2X
return 0
end
///////////////////////////////////////////////////////////////////////////////////////////////////
def isTriggered(triggerFlag, triggerItem)#1
if triggerFlag; return getGameFlag(triggerFlag); fin
if triggerItem; return partyHasItem(triggerItem); fin
return FALSE
end
///////////////////////////////////////////////////////////////////////////////////////////////////
// Called once for each step in the current quest.
def displayQuest_cb2(stepNum, questName, triggerFlag, triggerItem, stepFunc)#1
byte triggered
if stepNum == 0
displayf1("Quest: %s\n\n", questName)
fin
if (triggerFlag and getGameFlag(triggerFlag)) or (triggerItem and partyHasItem(triggerItem))
if isTriggered(triggerFlag, triggerItem)
anyTriggeredSteps = TRUE
curStepFunc = stepFunc
fin
@ -109,7 +117,7 @@ end
// This gets called for each step of one quest. 'stepFunc' will be e.g. step_101_1
def countQuests_cb2(stepNum, name, triggerFlag, triggerItem, stepFunc)#1
lastTriggered = FALSE
if (triggerFlag and getGameFlag(triggerFlag)) or (triggerItem and partyHasItem(triggerItem))
if isTriggered(triggerFlag, triggerItem)
anyTriggeredSteps = TRUE
lastTriggered = TRUE
fin