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

diff --git a/src/timer.h b/src/timer.h
index b5cbf2c0a..4640e575b 100644
--- a/src/timer.h
+++ b/src/timer.h
@@ -1,58 +1,42 @@
-//
-// C Interface: timer
-//
-// Description: 
-//
-//
-// Author: Tobias Glaesser <tobi.web@gmx.de>, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+#ifndef __SUPERTUX_TIMER_H__
+#define __SUPERTUX_TIMER_H__
 
-#ifndef SUPERTUX_TIMER_H
-#define SUPERTUX_TIMER_H
+extern float global_time;
 
-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);
-
-class Timer
+/**
+ * new simpler timer designed to be used in the update functions of objects
+ */
+class Timer2 // TODO rename later
 {
- 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);
+public:
+  Timer2();
+  ~Timer2();
+
+  /** start the timer with the given period (in seconds).
+   * If cyclic=true then the timer willl be reset after each period.
+   * Set period to zero if you want to disable the timer.
+   */
+  void start(float period, bool cyclic = false);
+  /** returns true if a period (or more) passed since start call or last
+   * successfull check
+   */
+  bool check();
+
+  /** returns the period of the timer or 0 if it isn't started */
+  float get_period() const
+  { return period; }
+  float get_timeleft() const
+  { return period - (global_time - cycle_start); }
+  float get_timegone() const
+  { return global_time - cycle_start; }
+  bool started() const
+  { return period != 0 && get_timeleft() > 0; }
+
+private:
+  float period;
+  float cycle_start;
+  bool cyclic;
 };
 
-#endif /*SUPERTUX_TIMER_H*/
+#endif
 
-/* Local Variables: */
-/* mode:c++ */
-/* End */