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

diff --git a/src/timer.cpp b/src/timer.cpp
index 8166e85e5..0ab3a7abb 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -20,36 +20,36 @@
 #include <config.h>
 
 #include <math.h>
-#include "timer.h"
+#include "timer.hpp"
 
-float global_time = 0;
+float game_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;
     }