walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Manual mission complete bug fix.

This commit is contained in:
Steve 2016-05-22 12:08:48 +01:00
parent 41aff3ee3c
commit cda791cfe8
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/battle/objectives.c
View File

@ -20,6 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "objectives.h" #include "objectives.h"
static int fireObjectivesComplete;
void doObjectives(void) void doObjectives(void)
{ {
int objectiveFailed; int objectiveFailed;
@ -76,11 +78,19 @@ void doObjectives(void)
if (battle.status == MS_IN_PROGRESS) if (battle.status == MS_IN_PROGRESS)
{ {
if (!battle.manualComplete && !hasHidden && battle.numObjectivesTotal > 0 && battle.numObjectivesComplete == battle.numObjectivesTotal) if (!hasHidden && battle.numObjectivesTotal > 0 && battle.numObjectivesComplete == battle.numObjectivesTotal)
{ {
runScriptFunction("ALL_OBJECTIVES_COMPLETE"); if (fireObjectivesComplete)
{
runScriptFunction("ALL_OBJECTIVES_COMPLETE");
completeMission(); fireObjectivesComplete = 0;
}
if (!battle.manualComplete)
{
completeMission();
}
} }
if (objectiveFailed) if (objectiveFailed)
@ -290,4 +300,6 @@ void loadObjectives(cJSON *node)
node = node->next; node = node->next;
} }
} }
fireObjectivesComplete = 1;
} }