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

[Fix] Don't think anyone noticed this one.. Some funny little bugs when paused while hyperspacing.

Browse Source
This commit is contained in:
Allanis 2013-03-16 17:20:18 +00:00
parent 6f12836395
commit 7db2ae019d
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/input.c
View File

@ -236,7 +236,7 @@ static void input_key(int keynum, double value, int abs) {
} }
} }
// Opens a menu. // Opens a menu.
else if(KEY("menu") && NOHYP()) { else if(KEY("menu")) {
if(value == KEY_PRESS) menu_small(); if(value == KEY_PRESS) menu_small();
} }
// Show pilot information. // Show pilot information.

3
src/player.c
View File

@ -12,6 +12,7 @@
#include "land.h" #include "land.h"
#include "sound.h" #include "sound.h"
#include "economy.h" #include "economy.h"
#include "pause.h"
#include "player.h" #include "player.h"
#define XML_GUI_ID "GUIs" // XML section identifier. #define XML_GUI_ID "GUIs" // XML section identifier.
@ -501,7 +502,7 @@ void player_render(void) {
} }
} }
// Hyperspace FLASH BANG!!! // Hyperspace FLASH BANG!!!
if(pilot_isFlag(player, PILOT_HYPERSPACE)) { if(pilot_isFlag(player, PILOT_HYPERSPACE) && !paused) {
i = (int)player->ptimer - HYPERSPACE_FADEOUT; i = (int)player->ptimer - HYPERSPACE_FADEOUT;
j = (int)SDL_GetTicks(); j = (int)SDL_GetTicks();
if(i < j) { if(i < j) {

2
src/space.c
View File

@ -598,7 +598,7 @@ void space_render(double dt) {
t = SDL_GetTicks(); t = SDL_GetTicks();
timer = player->ptimer - HYPERSPACE_STARS_BLUR; timer = player->ptimer - HYPERSPACE_STARS_BLUR;
if(pilot_isFlag(player, PILOT_HYPERSPACE) && (timer < t)) { if(pilot_isFlag(player, PILOT_HYPERSPACE) && !paused && (timer < t)) {
// Fancy hyperspace effects. // Fancy hyperspace effects.
glShadeModel(GL_SMOOTH); glShadeModel(GL_SMOOTH);

5
src/space.h
View File

@ -53,6 +53,11 @@ typedef struct Planet_ {
char* description; // Planet description. char* description; // Planet description.
char* bar_description; // Spaceport bar description. char* bar_description; // Spaceport bar description.
unsigned int services; // Offered services. unsigned int services; // Offered services.
// tech[0] stores global tech level (everything that and below) while
// tech[1-7] stores the unique tech levels.
int tech[8];
glTexture* gfx_space; // Graphics in space. glTexture* gfx_space; // Graphics in space.
glTexture* gfx_exterior; // Graphics in the exterior. glTexture* gfx_exterior; // Graphics in the exterior.
} Planet; } Planet;