From a2d313a08cd38f041ef3e185cb676627807414bf Mon Sep 17 00:00:00 2001 From: Allanis Date: Thu, 12 Dec 2013 00:44:42 +0000 Subject: [PATCH] [Fix] Fixed pausing game while player is hyperspacing. --- src/player.c | 3 ++- src/space.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/player.c b/src/player.c index 00fdf1a..e3047c8 100644 --- a/src/player.c +++ b/src/player.c @@ -1106,8 +1106,9 @@ void player_renderGUI(void) { } } /* Hyperspace FLASH BANG!!! */ - if(pilot_isFlag(player, PILOT_HYPERSPACE) && !paused) { + if(pilot_isFlag(player, PILOT_HYPERSPACE)) { i = (int)player->ptimer - HYPERSPACE_FADEOUT; + if(paused) i += t; j = (int) t; if(i < j) { x = (double)(j-i) / HYPERSPACE_FADEOUT; diff --git a/src/space.c b/src/space.c index 0a59686..031e426 100644 --- a/src/space.c +++ b/src/space.c @@ -1147,9 +1147,11 @@ static void space_renderStars(const double dt) { t = SDL_GetTicks(); if(!player_isFlag(PLAYER_DESTROYED) && !player_isFlag(PLAYER_CREATING) && pilot_isFlag(player, PILOT_HYPERSPACE) && /* Hyperspace fancy effect. */ - (player->ptimer-HYPERSPACE_STARS_BLUR < t)) { + ((!paused && (player->ptimer - HYPERSPACE_STARS_BLUR < t)) || + (paused && (player->ptimer < HYPERSPACE_STARS_BLUR)))) { timer = player->ptimer - HYPERSPACE_STARS_BLUR; + if(paused) timer += t; /* Fancy hyperspace effects. */ glShadeModel(GL_SMOOTH);