X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftimer.h;h=b5cbf2c0a1c6024e68e58443187db5fb730fc599;hb=b322b763e4782f0519434fed6dbee60686eeb1a4;hp=372adcc6227df8ddf7d0f633c746f01300c1441f;hpb=36cc92dc67c4cfdaceed7d47a4aa6992b407d1df;p=supertux.git

diff --git a/src/timer.h b/src/timer.h
index 372adcc62..b5cbf2c0a 100644
--- a/src/timer.h
+++ b/src/timer.h
@@ -13,45 +13,46 @@
 #ifndef SUPERTUX_TIMER_H
 #define SUPERTUX_TIMER_H
 
-/* Timer type */
-typedef struct timer_type
-  {
-   unsigned int period;
-   unsigned int time;
-   unsigned int (*get_ticks) (void);  
-  }
-timer_type;
-
 extern unsigned int st_pause_ticks, st_pause_count;
 
 unsigned int st_get_ticks(void);
 void st_pause_ticks_init(void);
 void st_pause_ticks_start(void);
 void st_pause_ticks_stop(void);
-void timer_init(timer_type* ptimer, bool st_ticks);
-void timer_start(timer_type* ptimer, unsigned int period);
-void timer_stop(timer_type* ptimer);
-/*======================================================================
-     int timer_check(timer_type* ptimer);
-    
-     param : pointer to a timer which needs to be checked
-     return: NO  = the timer is not started
-                   or it is over
-             YES = otherwise
-======================================================================*/
-int timer_check(timer_type* ptimer);
-int timer_started(timer_type* ptimer);
-/*======================================================================
-     int timer_get_left(timer_type* ptimer);
-
-     param : pointer to a timer that you want to get the time left
-     return: the time left (in millisecond)
-     note  : the returned value can be negative
-======================================================================*/
-int timer_get_left(timer_type* ptimer);
-int timer_get_gone(timer_type* ptimer);
-void timer_fwrite(timer_type* ptimer, FILE* fi);
-void timer_fread(timer_type* ptimer, FILE* fi);
+
+class Timer
+{
+ public:
+  unsigned int period;
+  unsigned int time;
+  unsigned int (*get_ticks) (void);  
+
+ public:
+  void init(bool st_ticks);
+  void start(unsigned int period);
+  void stop();
+
+  /*======================================================================
+    return: NO  = the timer is not started
+    or it is over
+    YES = otherwise
+    ======================================================================*/
+  int check();
+  int started();
+
+  /*======================================================================
+    return: the time left (in millisecond)
+    note  : the returned value can be negative
+    ======================================================================*/
+  int get_left();
+
+  int  get_gone();
+  void fwrite(FILE* fi);
+  void fread(FILE* fi);
+};
 
 #endif /*SUPERTUX_TIMER_H*/
 
+/* Local Variables: */
+/* mode:c++ */
+/* End */