Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Fixed pausing game while player is hyperspacing.

Browse Source
This commit is contained in:
Allanis 2013-12-12 00:44:42 +00:00
parent e4b5f54119
commit a2d313a08c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/player.c
View File

@ -1106,8 +1106,9 @@ void player_renderGUI(void) {
} }
} }
/* Hyperspace FLASH BANG!!! */ /* Hyperspace FLASH BANG!!! */
if(pilot_isFlag(player, PILOT_HYPERSPACE) && !paused) { if(pilot_isFlag(player, PILOT_HYPERSPACE)) {
i = (int)player->ptimer - HYPERSPACE_FADEOUT; i = (int)player->ptimer - HYPERSPACE_FADEOUT;
if(paused) i += t;
j = (int) t; j = (int) t;
if(i < j) { if(i < j) {
x = (double)(j-i) / HYPERSPACE_FADEOUT; x = (double)(j-i) / HYPERSPACE_FADEOUT;

4
src/space.c
View File

@ -1147,9 +1147,11 @@ static void space_renderStars(const double dt) {
t = SDL_GetTicks(); t = SDL_GetTicks();
if(!player_isFlag(PLAYER_DESTROYED) && !player_isFlag(PLAYER_CREATING) && if(!player_isFlag(PLAYER_DESTROYED) && !player_isFlag(PLAYER_CREATING) &&
pilot_isFlag(player, PILOT_HYPERSPACE) && /* Hyperspace fancy effect. */ 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; timer = player->ptimer - HYPERSPACE_STARS_BLUR;
if(paused) timer += t;
/* Fancy hyperspace effects. */ /* Fancy hyperspace effects. */
glShadeModel(GL_SMOOTH); glShadeModel(GL_SMOOTH);