X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsupertux%2Ftimer.cpp;h=735e4ab568e96e2e25c427be7f0ddbaa2ac12129;hb=575ee7830c331b48172dccacc7a96188f8d6695b;hp=3df088dc57fc1d5f23f8d3bddb08d069505c108e;hpb=a8057c3d1726484928a3091fdd5c7a3d810f5f63;p=supertux.git

diff --git a/src/supertux/timer.cpp b/src/supertux/timer.cpp
index 3df088dc5..735e4ab56 100644
--- a/src/supertux/timer.cpp
+++ b/src/supertux/timer.cpp
@@ -30,10 +30,10 @@ Timer::~Timer()
 }
 
 void
-Timer::start(float period, bool cyclic)
+Timer::start(float period_, bool cyclic_)
 {
-  this->period = period;
-  this->cyclic = cyclic;
+  this->period = period_;
+  this->cyclic = cyclic_;
   cycle_start = game_time;
 }