- moved lots of code around, made gameloop even more into a class

[supertux.git] / src / timer.cpp

diff --git a/src/timer.cpp b/src/timer.cpp
index 858f3fe..52b1b08 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -19,7 +19,7 @@ unsigned int st_pause_ticks, st_pause_count;
 unsigned int st_get_ticks(void)
 {
   if(st_pause_count != 0)
-    return SDL_GetTicks() - st_pause_ticks - SDL_GetTicks() + st_pause_count;
+    return /*SDL_GetTicks()*/ - st_pause_ticks /*- SDL_GetTicks()*/ + st_pause_count;
   else
     return SDL_GetTicks() - st_pause_ticks;
 }
@@ -37,6 +37,9 @@ void st_pause_ticks_start(void)
 
 void st_pause_ticks_stop(void)
 {
+if(st_pause_count == 0)
+return;
+
   st_pause_ticks += SDL_GetTicks() - st_pause_count;
   st_pause_count = 0;
 }