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

Show trophy alert at end of mission (not during, as the banner can obstruct the play area).

This commit is contained in:
Steve 2016-04-25 17:21:42 +01:00
parent b7746b9622
commit d7a96dbfbd
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/battle/battle.c
View File

@ -110,6 +110,11 @@ static void logic(void)
doPlayerSelect(); doPlayerSelect();
} }
} }
if (battle.status != MS_IN_PROGRESS && battle.missionFinishedTimer <= -FPS * 2)
{
doTrophyAlerts();
}
} }
doWidgets(); doWidgets();
@ -177,15 +182,15 @@ static void doBattle(void)
if (battle.status != MS_IN_PROGRESS) if (battle.status != MS_IN_PROGRESS)
{ {
battle.missionFinishedTimer--; battle.missionFinishedTimer--;
}
if (battle.unwinnable && battle.missionFinishedTimer <= -FPS * 6)
{
postBattle();
if (battle.unwinnable && battle.missionFinishedTimer <= -FPS * 6) destroyBattle();
{
postBattle();
destroyBattle(); initGalacticMap();
}
initGalacticMap();
} }
} }
@ -235,6 +240,11 @@ static void draw(void)
drawOptions(); drawOptions();
break; break;
} }
if (battle.status != MS_IN_PROGRESS && battle.status != MS_PAUSED && battle.missionFinishedTimer <= -FPS * 2)
{
drawTrophyAlert();
}
} }
static void drawMenu(void) static void drawMenu(void)

2
src/battle/battle.h
View File

@ -86,6 +86,8 @@ extern void clearInput(void);
extern void runScriptFunction(const char *format, ...); extern void runScriptFunction(const char *format, ...);
extern void doSpawners(void); extern void doSpawners(void);
extern void awardPostMissionTrophies(void); extern void awardPostMissionTrophies(void);
extern void doTrophyAlerts(void);
extern void drawTrophyAlert(void);
extern App app; extern App app;
extern Battle battle; extern Battle battle;