From 326b475923ae8db2123e5410ecfc3a3c10d184f8 Mon Sep 17 00:00:00 2001
From: Tamir Atias <engine.games@gmail.com>
Date: Sun, 17 Feb 2013 02:52:52 +0200
Subject: [PATCH] [Fix] Renamed time to gtime and made it global as it is used
 in pause.c

---
 src/main.c  | 8 ++++----
 src/pause.c | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main.c b/src/main.c
index bae8d75..dac9317 100644
--- a/src/main.c
+++ b/src/main.c
@@ -33,7 +33,7 @@
 #define FONT_SIZE       12
 
 static int quit = 0; // Primary loop.
-static unsigned int time = 0; // Calculate FPS and movement.
+unsigned int gtime = 0; // Calculate FPS and movement.
 static char version[VERSION_LEN];
 
 // Just some default crap.
@@ -135,7 +135,7 @@ int main(int argc, char** argv) {
   // Create new player. TODO: Start menu.
   player_new();
 
-  time = SDL_GetTicks(); // Init the time.
+  gtime = SDL_GetTicks(); // Init the time.
 
   // Main loop.
   SDL_Event event;
@@ -188,8 +188,8 @@ static double fps_dt = 1.;
 static double dt = 0.;
 static void update_space(void) {
   // dt in ms/1000.
-  dt = (double)(SDL_GetTicks() - time) / 1000.;
-  time = SDL_GetTicks();
+  dt = (double)(SDL_GetTicks() - gtime) / 1000.;
+  gtime = SDL_GetTicks();
   
   // TODO: This could use some work.
   if(dt > MINIMUM_FPS) {
diff --git a/src/pause.c b/src/pause.c
index 8ff1b6d..b08471a 100644
--- a/src/pause.c
+++ b/src/pause.c
@@ -11,7 +11,7 @@ int paused = 0; // Are we paused.
 extern Pilot** pilot_stack;
 extern int pilots;
 // From main.c
-extern unsigned int time;
+extern unsigned int gtime;
 
 static void pilots_pause(void);
 static void pilots_unpause(void);
@@ -20,7 +20,7 @@ static void pilots_unpause(void);
 void pause(void) {
   if(paused) return; // Well well.. We are paused already.
 
-  time -= SDL_GetTicks();
+  gtime -= SDL_GetTicks();
   pilots_pause();
   weapons_pause();
 
@@ -30,7 +30,7 @@ void pause(void) {
 void unpause(void) {
   if(!paused) return; // We are unpaused already.
 
-  time += SDL_GetTicks();
+  gtime += SDL_GetTicks();
   pilots_unpause();
   weapons_unpause();