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

Complete conditions when CompleteMission() is called.

This commit is contained in:
Steve 2015-11-29 16:50:06 +00:00
parent d3b0755f8b
commit f1f962aeae
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle/objectives.c
View File

@ -20,9 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "objectives.h" #include "objectives.h"
void completeConditions(void);
void failIncompleteObjectives(void);
void doObjectives(void) void doObjectives(void)
{ {
int objectiveFailed; int objectiveFailed;
@ -71,8 +68,6 @@ void doObjectives(void)
{ {
completeMission(); completeMission();
completeConditions();
updateChallenges(); updateChallenges();
} }

2
src/galaxy/mission.c
View File

@ -101,6 +101,8 @@ void completeMission(void)
game.stats[STAT_MISSIONS_COMPLETED]++; game.stats[STAT_MISSIONS_COMPLETED]++;
completeConditions();
retreatEnemies(); retreatEnemies();
player->flags |= EF_IMMORTAL; player->flags |= EF_IMMORTAL;

1
src/galaxy/mission.h
View File

@ -41,6 +41,7 @@ extern void selectWidget(const char *name, const char *group);
extern Entity *spawnExtractionPoint(void); extern Entity *spawnExtractionPoint(void);
extern Entity *spawnItem(char *type); extern Entity *spawnItem(char *type);
extern void failIncompleteObjectives(void); extern void failIncompleteObjectives(void);
extern void completeConditions(void);
extern void retreatEnemies(void); extern void retreatEnemies(void);
extern void initScript(cJSON *missionJSON); extern void initScript(cJSON *missionJSON);