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

Updated hasThreats logic.

This commit is contained in:
Steve 2016-05-15 17:28:17 +01:00
parent c7af23e55f
commit 4aec10e614
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle/battle.c
View File

@ -53,6 +53,8 @@ void initBattle(void)
app.delegate.draw = &draw; app.delegate.draw = &draw;
memset(&app.keyboard, 0, sizeof(int) * MAX_KEYBOARD_KEYS); memset(&app.keyboard, 0, sizeof(int) * MAX_KEYBOARD_KEYS);
battle.hasThreats = 1;
initQuadtree(&battle.quadtree); initQuadtree(&battle.quadtree);
initBullets(); initBullets();

4
src/battle/entities.c
View File

@ -217,14 +217,14 @@ void doEntities(void)
{ {
numSpawnedEnemies++; numSpawnedEnemies++;
} }
}
if (e->health > 0 && !(e->flags & EF_DISABLED)) if (!(e->flags & EF_DISABLED))
{ {
battle.hasThreats = 1; battle.hasThreats = 1;
} }
} }
} }
}
prev = e; prev = e;
} }

22
src/battle/objectives.c
View File

@ -42,6 +42,17 @@ void doObjectives(void)
{ {
battle.numConditions++; battle.numConditions++;
} }
if (o->isEliminateAll && o->status != OS_COMPLETE && !battle.hasThreats)
{
addHudMessage(colors.green, _("%s - Objective Complete!"), o->description);
o->currentValue = o->targetValue;
o->status = OS_COMPLETE;
runScriptFunction("OBJECTIVES_COMPLETE %d", battle.numObjectivesComplete + 1);
}
} }
else else
{ {
@ -119,17 +130,6 @@ void updateObjective(char *name, int type)
runScriptFunction("OBJECTIVES_COMPLETE %d", ++completed); runScriptFunction("OBJECTIVES_COMPLETE %d", ++completed);
} }
} }
if (o->isEliminateAll && o->status != OS_COMPLETE && !battle.hasThreats)
{
addHudMessage(colors.green, _("%s - Objective Complete!"), o->description);
o->currentValue = o->targetValue;
o->status = OS_COMPLETE;
runScriptFunction("OBJECTIVES_COMPLETE %d", ++completed);
}
} }
if (!o->active) if (!o->active)