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

Centralize completeMission and failMission logic.

This commit is contained in:
Steve 2015-11-02 19:18:26 +00:00
parent cd1068b2a7
commit 1cd8b42664
4 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/battle/battle.c
View File

@ -134,18 +134,6 @@ static void doBattle(void)
if (battle.status != MS_IN_PROGRESS) if (battle.status != MS_IN_PROGRESS)
{ {
battle.missionFinishedTimer--; battle.missionFinishedTimer--;
if (battle.missionFinishedTimer == 0)
{
if (battle.status == MS_COMPLETE)
{
selectWidget("continue", "battleWon");
}
else
{
selectWidget("retry", "battleLost");
}
}
} }
battle.stats[STAT_TIME]++; battle.stats[STAT_TIME]++;
@ -247,6 +235,14 @@ static void handleKeyboard(void)
{ {
battle.status = MS_PAUSED; battle.status = MS_PAUSED;
} }
#if DEBUG
if (app.keyboard[SDL_SCANCODE_F10])
{
completeMission();
battle.missionFinishedTimer = -FPS;
}
#endif
} }
static void start(void) static void start(void)

1
src/battle/battle.h
View File

@ -65,6 +65,7 @@ extern void checkTrigger(char *name, int type);
extern void resetWaypoints(void); extern void resetWaypoints(void);
extern void doPlayerSelect(void); extern void doPlayerSelect(void);
extern void destroyGrid(void); extern void destroyGrid(void);
extern void completeMission(void);
extern App app; extern App app;
extern Battle battle; extern Battle battle;

20
src/galaxy/mission.c
View File

@ -98,16 +98,24 @@ void loadMission(char *filename)
void completeMission(void) void completeMission(void)
{ {
battle.status = MS_COMPLETE; if (battle.status == MS_IN_PROGRESS)
battle.missionFinishedTimer = FPS; {
battle.status = MS_COMPLETE;
game.stats[STAT_MISSIONS_COMPLETED]++; battle.missionFinishedTimer = FPS;
selectWidget("continue", "battleWon");
game.stats[STAT_MISSIONS_COMPLETED]++;
}
} }
void failMission(void) void failMission(void)
{ {
battle.status = MS_FAILED; if (battle.status == MS_IN_PROGRESS)
battle.missionFinishedTimer = FPS; {
battle.status = MS_FAILED;
battle.missionFinishedTimer = FPS;
selectWidget("retry", "battleLost");
}
} }
static void loadObjectives(cJSON *node) static void loadObjectives(cJSON *node)

1
src/galaxy/mission.h
View File

@ -37,6 +37,7 @@ extern void initPlayer(void);
extern long flagsToLong(char *flags); extern long flagsToLong(char *flags);
extern Entity *spawnWaypoint(void); extern Entity *spawnWaypoint(void);
extern void activateNextWaypoint(void); extern void activateNextWaypoint(void);
extern void selectWidget(const char *name, const char *group);
extern Battle battle; extern Battle battle;
extern Entity *player; extern Entity *player;