// $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
// 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
#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;
}
return false;
}
-