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

Eliminate all tweaks.

This commit is contained in:
Steve 2016-01-24 09:50:31 +00:00
parent a73a44fd55
commit 672fd01282
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/battle/fighters.c
View File

@ -221,8 +221,9 @@ void doFighter(void)
if ((self->flags & EF_DISABLED) == 0) if ((self->flags & EF_DISABLED) == 0)
{ {
self->flags |= EF_DISABLED; self->flags |= EF_DISABLED;
updateObjective(self->name, TT_DISABLE);
battle.stats[STAT_ENEMIES_DISABLED]++; battle.stats[STAT_ENEMIES_DISABLED]++;
updateObjective(self->name, TT_DISABLE);
} }
} }

4
src/battle/objectives.c
View File

@ -111,7 +111,7 @@ void updateObjective(char *name, int type)
} }
} }
if (o->isEliminateAll && !battle.numEnemies && o->status != OS_COMPLETE) if (o->isEliminateAll && o->status != OS_COMPLETE && battle.stats[STAT_ENEMIES_KILLED] == battle.numInitialEnemies)
{ {
o->status = OS_COMPLETE; o->status = OS_COMPLETE;
@ -207,7 +207,7 @@ void activateObjectives(char *objectives)
addHudMessage(colors.cyan, "New Objective : %s", o->description); addHudMessage(colors.cyan, "New Objective : %s", o->description);
o->active = 1; o->active = 1;
if (o->isEliminateAll && battle.stats[STAT_ENEMIES_KILLED] == battle.numInitialEnemies) if (o->isEliminateAll)
{ {
updateObjective(o->targetName, o->targetType); updateObjective(o->targetName, o->targetType);
} }