X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftimer.cpp;h=105ce752090a5ee795bc1b77d47adca16145b8cc;hb=f17ff6d7a4ebb176f264e037b12ab8adfbeb3846;hp=8166e85e5eee5887cd07ad90b5c8a96e8856e00c;hpb=60908c905544776c376421b8d3e12eeb936c068f;p=supertux.git

diff --git a/src/timer.cpp b/src/timer.cpp
index 8166e85e5..105ce7520 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,7 +12,7 @@
 //  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
@@ -20,36 +20,37 @@
 #include <config.h>
 
 #include <math.h>
-#include "timer.h"
+#include "timer.hpp"
 
-float global_time = 0;
+float game_time = 0;
+float real_time = 0;
 
-Timer2::Timer2()
+Timer::Timer()
   : period(0), cycle_start(0), cyclic(false)
 {
 }
 
-Timer2::~Timer2()
+Timer::~Timer()
 {
 }
 
 void
-Timer2::start(float period, bool cyclic)
+Timer::start(float period, bool cyclic)
 {
   this->period = period;
   this->cyclic = cyclic;
-  cycle_start = global_time;
+  cycle_start = game_time;
 }
 
 bool
-Timer2::check()
+Timer::check()
 {
   if(period == 0)
     return false;
   
-  if(global_time - cycle_start >= period) {
+  if(game_time - cycle_start >= period) {
     if(cyclic) {
-      cycle_start = global_time - fmodf(global_time - cycle_start, period);
+      cycle_start = game_time - fmodf(game_time - cycle_start, period);
     } else {
       period = 0;
     }