projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add code to debug collision rectangles
[supertux.git]
/
src
/
timer.hpp
diff --git
a/src/timer.hpp
b/src/timer.hpp
index
42e1b8f
..
46f00f4
100644
(file)
--- a/
src/timer.hpp
+++ b/
src/timer.hpp
@@
-20,7
+20,7
@@
#ifndef __SUPERTUX_TIMER_H__
#define __SUPERTUX_TIMER_H__
#ifndef __SUPERTUX_TIMER_H__
#define __SUPERTUX_TIMER_H__
-extern float g
lobal
_time;
+extern float g
ame
_time;
/**
* new simpler timer designed to be used in the update functions of objects
/**
* new simpler timer designed to be used in the update functions of objects
@@
-48,9
+48,9
@@
public:
float get_period() const
{ return period; }
float get_timeleft() const
float get_period() const
{ return period; }
float get_timeleft() const
- { return period - (g
lobal
_time - cycle_start); }
+ { return period - (g
ame
_time - cycle_start); }
float get_timegone() const
float get_timegone() const
- { return g
lobal
_time - cycle_start; }
+ { return g
ame
_time - cycle_start; }
bool started() const
{ return period != 0 && get_timeleft() > 0; }
bool started() const
{ return period != 0 && get_timeleft() > 0; }