projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manually add dependency from lexer.cpp to parser.hpp
[supertux.git]
/
src
/
timer.cpp
diff --git
a/src/timer.cpp
b/src/timer.cpp
index
8166e85
..
0ab3a7a
100644
(file)
--- a/
src/timer.cpp
+++ b/
src/timer.cpp
@@
-20,36
+20,36
@@
#include <config.h>
#include <math.h>
#include <config.h>
#include <math.h>
-#include "timer.h"
+#include "timer.h
pp
"
-float g
lobal
_time = 0;
+float g
ame
_time = 0;
-Timer
2::Timer2
()
+Timer
::Timer
()
: period(0), cycle_start(0), cyclic(false)
{
}
: period(0), cycle_start(0), cyclic(false)
{
}
-Timer
2::~Timer2
()
+Timer
::~Timer
()
{
}
void
{
}
void
-Timer
2
::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 = g
lobal
_time;
+ cycle_start = g
ame
_time;
}
bool
}
bool
-Timer
2
::check()
+Timer::check()
{
if(period == 0)
return false;
{
if(period == 0)
return false;
- if(g
lobal
_time - cycle_start >= period) {
+ if(g
ame
_time - cycle_start >= period) {
if(cyclic) {
if(cyclic) {
- cycle_start = g
lobal_time - fmodf(global
_time - cycle_start, period);
+ cycle_start = g
ame_time - fmodf(game
_time - cycle_start, period);
} else {
period = 0;
}
} else {
period = 0;
}