Merge branch 'develop' into plus
This commit is contained in:
commit
1ad4746a27
|
@ -767,6 +767,8 @@ void drawGameOver(void)
|
||||||
{
|
{
|
||||||
int fadeAmount;
|
int fadeAmount;
|
||||||
|
|
||||||
|
fadeAmount = 0;
|
||||||
|
|
||||||
if (world.gameOverTimer <= -FPS)
|
if (world.gameOverTimer <= -FPS)
|
||||||
{
|
{
|
||||||
fadeAmount = MIN((world.gameOverTimer + FPS) * -1, 128);
|
fadeAmount = MIN((world.gameOverTimer + FPS) * -1, 128);
|
||||||
|
@ -776,7 +778,7 @@ void drawGameOver(void)
|
||||||
|
|
||||||
if (world.gameOverTimer <= -FPS * 2)
|
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)
|
if (world.gameOverTimer <= -FPS * 3)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue