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

[Change] Small code cleanup.

Browse Source
This commit is contained in:
Allanis 2014-07-22 14:19:42 +01:00
parent 58e28df6bb
commit bb81e44374
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lephisto.c
View File

@ -67,16 +67,16 @@
#define LEPHISTO_INIT_DELAY 3000 /**< Minimum amount of time to wait with loading screen. */ #define LEPHISTO_INIT_DELAY 3000 /**< Minimum amount of time to wait with loading screen. */
static int quit = 0; /**< For primary loop. */ static int quit = 0; /**< For primary loop. */
static unsigned int time = 0; /**< Used to calculate FPS and movement, in pause.c */ static unsigned int time = 0; /**< Used to calculate FPS and movement. */
static char version[VERSION_LEN]; /**< Contains version. */ static char version[VERSION_LEN]; /**< Contains version. */
static glTexture* loading; /**< Loading screen. */ static glTexture* loading; /**< Loading screen. */
/* Some defaults. */ /* Some defaults. */
int nosound = 0; /**< Disable sound when loaded. */ int nosound = 0; /**< Disable sound when loaded. */
int show_fps = 1; /**< Shows fps - default true. */ int show_fps = 1; /**< Shows fps - default true. */
int max_fps = 0; /**< Default FPS limit, 0 is no limit. */ int max_fps = 0; /**< Default FPS limit, 0 is no limit. */
int indjoystick = -1; /**< Index of joystick to use, -1 is none. */ int indjoystick = -1; /**< Index of joystick to use, -1 is none. */
char* namjoystick = NULL; /**< Name of joystick to use, NULL is none. */ char* namjoystick = NULL; /**< Name of joystick to use, NULL is none. */
/* Prototypes. */ /* Prototypes. */
/* Loading. */ /* Loading. */

7
src/pause.c
View File

@ -5,19 +5,14 @@
* *
* Main trick to pausing/unpausing is to allow things based on time * Main trick to pausing/unpausing is to allow things based on time
* to behave properly when the toolkit opens a window. * to behave properly when the toolkit opens a window.
*
* @todo Should probably be eliminated by making everything use the dt system.
*/ */
#include "player.h" #include "player.h"
#include "pause.h" #include "pause.h"
int paused = 0; /**< Are we paused. */ int paused = 0; /**< Are we paused. */
double dt_mod = 1.; /**< dt modifier. */ double dt_mod = 1.; /**< dt modifier. */
/* From main.c */
extern unsigned int time; /**< From lephisto.c. */
/* Pause the game. */ /* Pause the game. */
void pause_game(void) { void pause_game(void) {
if(paused) return; /* Well well.. We are paused already. */ if(paused) return; /* Well well.. We are paused already. */