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

Centralized mission failure logic.

This commit is contained in:
Steve 2015-11-14 08:41:31 +00:00
parent 1f62eb2564
commit 1760c9e3b3
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle/objectives.c
View File

@ -79,8 +79,6 @@ void doObjectives(void)
if (objectiveFailed) if (objectiveFailed)
{ {
failMission(); failMission();
failIncompleteObjectives();
} }
} }
} }

10
src/battle/player.c
View File

@ -132,10 +132,7 @@ void doPlayer(void)
{ {
if (!battle.epic) if (!battle.epic)
{ {
failIncompleteObjectives(); failMission();
battle.status = MS_FAILED;
battle.missionFinishedTimer = FPS;
} }
else if (player->health == -FPS) else if (player->health == -FPS)
{ {
@ -171,10 +168,7 @@ void initPlayerSelect(void)
{ {
battle.epic = 0; battle.epic = 0;
failIncompleteObjectives(); failMission();
battle.status = MS_FAILED;
battle.missionFinishedTimer = FPS;
} }
} }

1
src/battle/player.h
View File

@ -33,6 +33,7 @@ extern int getDistance(int x1, int y1, int x2, int y2);
extern void failIncompleteObjectives(void); extern void failIncompleteObjectives(void);
extern void addHudMessage(SDL_Color c, char *format, ...); extern void addHudMessage(SDL_Color c, char *format, ...);
extern int mod(int n, int x); extern int mod(int n, int x);
extern void failMission(void);
extern App app; extern App app;
extern Battle battle; extern Battle battle;

1
src/galaxy/mission.h
View File

@ -39,6 +39,7 @@ extern Entity *spawnWaypoint(void);
extern void activateNextWaypoint(void); extern void activateNextWaypoint(void);
extern void selectWidget(const char *name, const char *group); extern void selectWidget(const char *name, const char *group);
extern Entity *spawnExtractionPoint(void); extern Entity *spawnExtractionPoint(void);
extern void failIncompleteObjectives(void);
extern Battle battle; extern Battle battle;
extern Entity *player; extern Entity *player;