From 672fd012829c8812c655a7a0436da099490ca9c0 Mon Sep 17 00:00:00 2001 From: Steve Date: Sun, 24 Jan 2016 09:50:31 +0000 Subject: [PATCH] Eliminate all tweaks. --- src/battle/fighters.c | 3 ++- src/battle/objectives.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/battle/fighters.c b/src/battle/fighters.c index a379222..7d07f2f 100644 --- a/src/battle/fighters.c +++ b/src/battle/fighters.c @@ -221,8 +221,9 @@ void doFighter(void) if ((self->flags & EF_DISABLED) == 0) { self->flags |= EF_DISABLED; - updateObjective(self->name, TT_DISABLE); battle.stats[STAT_ENEMIES_DISABLED]++; + + updateObjective(self->name, TT_DISABLE); } } diff --git a/src/battle/objectives.c b/src/battle/objectives.c index 122b9c3..6c312e3 100644 --- a/src/battle/objectives.c +++ b/src/battle/objectives.c @@ -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; @@ -207,7 +207,7 @@ void activateObjectives(char *objectives) addHudMessage(colors.cyan, "New Objective : %s", o->description); o->active = 1; - if (o->isEliminateAll && battle.stats[STAT_ENEMIES_KILLED] == battle.numInitialEnemies) + if (o->isEliminateAll) { updateObjective(o->targetName, o->targetType); }