Merge branch 'develop' into plus

This commit is contained in:
Steve 2018-05-15 07:46:53 +01:00
commit 1ad4746a27
1 changed files with 3 additions and 1 deletions

View File

@ -767,6 +767,8 @@ void drawGameOver(void)
{
int fadeAmount;
fadeAmount = 0;
if (world.gameOverTimer <= -FPS)
{
fadeAmount = MIN((world.gameOverTimer + FPS) * -1, 128);
@ -776,7 +778,7 @@ void drawGameOver(void)
if (world.gameOverTimer <= -FPS * 2)
{
blitRect(atlasTexture->texture, SCREEN_WIDTH / 2, 280, &missionFailed->rect, 1);
blitRect(atlasTexture->texture, SCREEN_WIDTH / 2, 240, &missionFailed->rect, 1);
if (world.gameOverTimer <= -FPS * 3)
{