- fixed problem with last_menu not being able to handle menues deeper than two submenues

[supertux.git] / src / timer.cpp

diff --git a/src/timer.cpp b/src/timer.cpp
index 25a63a3..0fd6c18 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;
 }
@@ -32,103 +32,115 @@ void st_pause_ticks_init(void)
 
 void st_pause_ticks_start(void)
 {
-  st_pause_count = SDL_GetTicks();
+  if(st_pause_count == 0)
+    st_pause_count = SDL_GetTicks();
 }
 
 void st_pause_ticks_stop(void)
 {
+if(st_pause_count == 0)
+return;
+
   st_pause_ticks += SDL_GetTicks() - st_pause_count;
   st_pause_count = 0;
 }
 
-void timer_init(timer_type* ptimer, int st_ticks)
+void
+Timer::init(bool st_ticks)
 {
-  ptimer->period = 0;
-  ptimer->time = 0;
-
-  if(st_ticks == YES)
-    ptimer->get_ticks = st_get_ticks;
-  else
-    ptimer->get_ticks = SDL_GetTicks;
-
+  period    = 0;
+  time      = 0;
+  get_ticks = st_ticks ? st_get_ticks : SDL_GetTicks;
 }
 
-void timer_start(timer_type* ptimer, unsigned int period)
+void
+Timer::start(unsigned int period_)
 {
-  ptimer->time = ptimer->get_ticks();
-  ptimer->period = period;
+  time   = get_ticks();
+  period = period_;
 }
 
-void timer_stop(timer_type* ptimer)
+void
+Timer::stop()
 {
-  if(ptimer->get_ticks == st_get_ticks)
-    timer_init(ptimer,YES);
+  if(get_ticks == st_get_ticks)
+    init(true);
   else
-    timer_init(ptimer,NO);
+    init(false);
 }
 
-int timer_check(timer_type* ptimer)
+int
+Timer::check()
 {
-  if((ptimer->time != 0) && (ptimer->time + ptimer->period > ptimer->get_ticks()))
-    return YES;
+  if((time != 0) && (time + period > get_ticks()))
+    return true;
   else
     {
-      ptimer->time = 0;
-      return NO;
+      time = 0;
+      return false;
     }
 }
 
-int timer_started(timer_type* ptimer)
+int
+Timer::started()
 {
-  if(ptimer->time != 0)
-    return YES;
+  if(time != 0)
+    return true;
   else
-    return NO;
+    return false;
 }
 
-int timer_get_left(timer_type* ptimer)
+int
+Timer::get_left()
 {
-  return (ptimer->period - (ptimer->get_ticks() - ptimer->time));
+  return (period - (get_ticks() - time));
 }
 
-int timer_get_gone(timer_type* ptimer)
+int
+Timer::get_gone()
 {
-  return (ptimer->get_ticks() - ptimer->time);
+  return (get_ticks() - time);
 }
 
-int timer_fwrite(timer_type* ptimer, FILE* fi)
+void
+Timer::fwrite(FILE* fi)
 {
   unsigned int diff_ticks;
   int tick_mode;
-  if(ptimer->time != 0)
-    diff_ticks = ptimer->get_ticks() - ptimer->time;
+  if(time != 0)
+    diff_ticks = get_ticks() - time;
   else
     diff_ticks = 0;
 
-  fwrite(&ptimer->period,sizeof(unsigned int),1,fi);
-  fwrite(&diff_ticks,sizeof(unsigned int),1,fi);
-  if(ptimer->get_ticks == st_get_ticks)
-      tick_mode = YES;
+  ::fwrite(&period,sizeof(unsigned int),1,fi);
+  ::fwrite(&diff_ticks,sizeof(unsigned int),1,fi);
+  if(get_ticks == st_get_ticks)
+      tick_mode = true;
   else
-      tick_mode = NO;
-  fwrite(&tick_mode,sizeof(unsigned int),1,fi);
+      tick_mode = false;
+  ::fwrite(&tick_mode,sizeof(unsigned int),1,fi);
 }
 
-int timer_fread(timer_type* ptimer, FILE* fi)
+void
+Timer::fread(FILE* fi)
 {
   unsigned int diff_ticks;
   int tick_mode;
-  fread(&ptimer->period,sizeof(unsigned int),1,fi);
-  fread(&diff_ticks,sizeof(unsigned int),1,fi);
-  fread(&tick_mode,sizeof(unsigned int),1,fi);
-  if(tick_mode == YES)
-    ptimer->get_ticks = st_get_ticks;
+
+  ::fread(&period,sizeof(unsigned int),1,fi);
+  ::fread(&diff_ticks,sizeof(unsigned int),1,fi);
+  ::fread(&tick_mode,sizeof(unsigned int),1,fi);
+
+  if (tick_mode)
+    get_ticks = st_get_ticks;
   else
-    ptimer->get_ticks = SDL_GetTicks;
-  if(diff_ticks != 0)
-    ptimer->time = ptimer->get_ticks() - diff_ticks;
+    get_ticks = SDL_GetTicks;
+
+  if (diff_ticks != 0)
+    time = get_ticks() - diff_ticks;
   else
-    ptimer->time = 0;
+    time = 0;
 
 }
 
+/* EOF */