Restrict displaying of trophies during mission.

This commit is contained in:
Steve 2018-02-20 12:31:41 +00:00
parent 8a9dcb1ff7
commit 2600f3cd1a
5 changed files with 29 additions and 16 deletions

View File

@ -249,28 +249,34 @@ void awardTrophies(void)
void doTrophyAlerts(void) void doTrophyAlerts(void)
{ {
if (!alertTrophy) if (app.config.trophyAlert == 1 || (app.config.trophyAlert == 2 && !app.restrictTrophyAlert))
{ {
nextAlert(); if (!alertTrophy)
}
else if (alertTrophy)
{
alertRect.x = MIN(alertRect.x + 24, -1);
if (alertRect.x > -150)
{ {
alertTimer--; nextAlert();
}
else if (alertTrophy)
{
alertRect.x = MIN(alertRect.x + 24, -1);
if (alertRect.x > -150)
{
alertTimer--;
}
if (alertTimer <= 0)
{
if (app.config.trophyScreenshot)
{
saveScreenshot(alertTrophy->id);
}
alertTrophy->notify = 0;
resetAlert();
}
} }
if (alertTimer <= 0) sparkleAngle = mod(sparkleAngle + 0.25, 360);
{
saveScreenshot(alertTrophy->id);
alertTrophy->notify = 0;
resetAlert();
}
} }
sparkleAngle = mod(sparkleAngle + 0.25, 360);
} }
static void nextAlert(void) static void nextAlert(void)

View File

@ -200,6 +200,8 @@ void initHub(void)
app.delegate.logic = &logic; app.delegate.logic = &logic;
app.delegate.draw = &draw; app.delegate.draw = &draw;
app.restrictTrophyAlert = 0;
playMusic(1); playMusic(1);
endSectionTransition(); endSectionTransition();

View File

@ -34,6 +34,8 @@ void initPostMission(void)
app.delegate.logic = logic; app.delegate.logic = logic;
app.delegate.draw = draw; app.delegate.draw = draw;
app.restrictTrophyAlert = 0;
endSectionTransition(); endSectionTransition();
} }

View File

@ -354,6 +354,7 @@ typedef struct {
int awaitingWidgetInput; int awaitingWidgetInput;
int lastKeyPressed; int lastKeyPressed;
int lastButtonPressed; int lastButtonPressed;
int restrictTrophyAlert;
Config config; Config config;
} App; } App;

View File

@ -120,6 +120,8 @@ void initWorld(void)
app.delegate.logic = logic; app.delegate.logic = logic;
app.delegate.draw = draw; app.delegate.draw = draw;
app.restrictTrophyAlert = 1;
endSectionTransition(); endSectionTransition();
} }