From bb81e4437484a344b576dddb94e9d86f49ff4863 Mon Sep 17 00:00:00 2001 From: Allanis Date: Tue, 22 Jul 2014 14:19:42 +0100 Subject: [PATCH] [Change] Small code cleanup. --- src/lephisto.c | 12 ++++++------ src/pause.c | 7 +------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/lephisto.c b/src/lephisto.c index da763c1..b90a024 100644 --- a/src/lephisto.c +++ b/src/lephisto.c @@ -67,16 +67,16 @@ #define LEPHISTO_INIT_DELAY 3000 /**< Minimum amount of time to wait with loading screen. */ 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 glTexture* loading; /**< Loading screen. */ /* Some defaults. */ -int nosound = 0; /**< Disable sound when loaded. */ -int show_fps = 1; /**< Shows fps - default true. */ -int max_fps = 0; /**< Default FPS limit, 0 is no limit. */ -int indjoystick = -1; /**< Index of joystick to use, -1 is none. */ -char* namjoystick = NULL; /**< Name of joystick to use, NULL is none. */ +int nosound = 0; /**< Disable sound when loaded. */ +int show_fps = 1; /**< Shows fps - default true. */ +int max_fps = 0; /**< Default FPS limit, 0 is no limit. */ +int indjoystick = -1; /**< Index of joystick to use, -1 is none. */ +char* namjoystick = NULL; /**< Name of joystick to use, NULL is none. */ /* Prototypes. */ /* Loading. */ diff --git a/src/pause.c b/src/pause.c index d8e423d..94c0177 100644 --- a/src/pause.c +++ b/src/pause.c @@ -5,19 +5,14 @@ * * Main trick to pausing/unpausing is to allow things based on time * 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 "pause.h" -int paused = 0; /**< Are we paused. */ +int paused = 0; /**< Are we paused. */ double dt_mod = 1.; /**< dt modifier. */ -/* From main.c */ -extern unsigned int time; /**< From lephisto.c. */ - /* Pause the game. */ void pause_game(void) { if(paused) return; /* Well well.. We are paused already. */