X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftimer.cpp;h=0ab3a7abbce29f23f7e936887d33e79aa61a766e;hb=5c14f6f384eff76491d494b4c157abf2ff776d49;hp=0fd6c188b2b129d5a344eae8941a0c9c1a1311ec;hpb=b56d18cd12b1892a7588b1fe620b1df26f7e7d4f;p=supertux.git

diff --git a/src/timer.cpp b/src/timer.cpp
index 0fd6c188b..0ab3a7abb 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -1,146 +1,61 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
 //
-// C Implementation: timer
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
 //
-// Description:
-//
-//
-// Author: Tobias Glaesser <tobi.web@gmx.de>, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-
-#include "SDL.h"
-#include "defines.h"
-#include "timer.h"
-
-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;
-  else
-    return SDL_GetTicks() - st_pause_ticks;
-}
-
-void st_pause_ticks_init(void)
-{
-  st_pause_ticks = 0;
-  st_pause_count = 0;
-}
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+//  02111-1307, USA.
+#include <config.h>
 
-void st_pause_ticks_start(void)
-{
-  if(st_pause_count == 0)
-    st_pause_count = SDL_GetTicks();
-}
+#include <math.h>
+#include "timer.hpp"
 
-void st_pause_ticks_stop(void)
-{
-if(st_pause_count == 0)
-return;
+float game_time = 0;
 
-  st_pause_ticks += SDL_GetTicks() - st_pause_count;
-  st_pause_count = 0;
-}
-
-void
-Timer::init(bool st_ticks)
+Timer::Timer()
+  : period(0), cycle_start(0), cyclic(false)
 {
-  period    = 0;
-  time      = 0;
-  get_ticks = st_ticks ? st_get_ticks : SDL_GetTicks;
 }
 
-void
-Timer::start(unsigned int period_)
+Timer::~Timer()
 {
-  time   = get_ticks();
-  period = period_;
 }
 
 void
-Timer::stop()
+Timer::start(float period, bool cyclic)
 {
-  if(get_ticks == st_get_ticks)
-    init(true);
-  else
-    init(false);
+  this->period = period;
+  this->cyclic = cyclic;
+  cycle_start = game_time;
 }
 
-int
+bool
 Timer::check()
 {
-  if((time != 0) && (time + period > get_ticks()))
-    return true;
-  else
-    {
-      time = 0;
-      return false;
+  if(period == 0)
+    return false;
+  
+  if(game_time - cycle_start >= period) {
+    if(cyclic) {
+      cycle_start = game_time - fmodf(game_time - cycle_start, period);
+    } else {
+      period = 0;
     }
-}
-
-int
-Timer::started()
-{
-  if(time != 0)
     return true;
-  else
-    return false;
-}
-
-int
-Timer::get_left()
-{
-  return (period - (get_ticks() - time));
-}
-
-int
-Timer::get_gone()
-{
-  return (get_ticks() - time);
-}
-
-void
-Timer::fwrite(FILE* fi)
-{
-  unsigned int diff_ticks;
-  int tick_mode;
-  if(time != 0)
-    diff_ticks = get_ticks() - time;
-  else
-    diff_ticks = 0;
-
-  ::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 = false;
-  ::fwrite(&tick_mode,sizeof(unsigned int),1,fi);
-}
-
-void
-Timer::fread(FILE* fi)
-{
-  unsigned int diff_ticks;
-  int tick_mode;
-
-  ::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
-    get_ticks = SDL_GetTicks;
-
-  if (diff_ticks != 0)
-    time = get_ticks() - diff_ticks;
-  else
-    time = 0;
+  }
 
+  return false;
 }
 
-/* EOF */