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

If a mission has hidden objectives, don't complete when all current ones are finished.

This commit is contained in:
Steve 2016-04-18 10:54:59 +01:00
parent 2723e084da
commit 9f4be9a780
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/battle/objectives.c
View File

@ -23,12 +23,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
void doObjectives(void) void doObjectives(void)
{ {
int objectiveFailed; int objectiveFailed;
int numHiddenObjectives; int hasHidden;
Objective *o; Objective *o;
battle.numObjectivesComplete = battle.numObjectivesTotal = battle.numConditions = 0; battle.numObjectivesComplete = battle.numObjectivesTotal = battle.numConditions = 0;
objectiveFailed = 0; objectiveFailed = 0;
numHiddenObjectives = 0; hasHidden = 0;
for (o = battle.objectiveHead.next ; o != NULL ; o = o->next) for (o = battle.objectiveHead.next ; o != NULL ; o = o->next)
{ {
@ -45,7 +45,7 @@ void doObjectives(void)
} }
else else
{ {
numHiddenObjectives++; hasHidden = 1;
} }
if (o->currentValue == o->targetValue) if (o->currentValue == o->targetValue)
@ -65,7 +65,7 @@ void doObjectives(void)
if (battle.status == MS_IN_PROGRESS) if (battle.status == MS_IN_PROGRESS)
{ {
if (!battle.manualComplete && numHiddenObjectives == 0 && battle.numObjectivesTotal > 0 && battle.numObjectivesComplete == battle.numObjectivesTotal) if (!battle.manualComplete && !hasHidden && battle.numObjectivesTotal > 0 && battle.numObjectivesComplete == battle.numObjectivesTotal)
{ {
completeMission(); completeMission();
} }
@ -80,10 +80,12 @@ void doObjectives(void)
void updateObjective(char *name, int type) void updateObjective(char *name, int type)
{ {
Objective *o; Objective *o;
int completed; int completed, hasHidden;
completed = battle.numObjectivesComplete; completed = battle.numObjectivesComplete;
hasHidden = 0;
for (o = battle.objectiveHead.next ; o != NULL ; o = o->next) for (o = battle.objectiveHead.next ; o != NULL ; o = o->next)
{ {
if (o->active && o->status != OS_COMPLETE) if (o->active && o->status != OS_COMPLETE)
@ -127,9 +129,14 @@ void updateObjective(char *name, int type)
runScriptFunction("OBJECTIVES_COMPLETE %d", ++completed); runScriptFunction("OBJECTIVES_COMPLETE %d", ++completed);
} }
} }
if (!o->active)
{
hasHidden = 1;
}
} }
if (completed == battle.numObjectivesTotal) if (completed == battle.numObjectivesTotal && !hasHidden)
{ {
runScriptFunction("ALL_OBJECTIVES_COMPLETE"); runScriptFunction("ALL_OBJECTIVES_COMPLETE");
} }