projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No more count-to-infinity for the coins display
[supertux.git]
/
src
/
timer.cpp
diff --git
a/src/timer.cpp
b/src/timer.cpp
index
939b930
..
9c94f58
100644
(file)
--- a/
src/timer.cpp
+++ b/
src/timer.cpp
@@
-23,6
+23,7
@@
#include "timer.hpp"
float game_time = 0;
#include "timer.hpp"
float game_time = 0;
+float real_time = 0;
Timer::Timer()
: period(0), cycle_start(0), cyclic(false)
Timer::Timer()
: period(0), cycle_start(0), cyclic(false)
@@
-46,7
+47,7
@@
Timer::check()
{
if(period == 0)
return false;
{
if(period == 0)
return false;
-
+
if(game_time - cycle_start >= period) {
if(cyclic) {
cycle_start = game_time - fmodf(game_time - cycle_start, period);
if(game_time - cycle_start >= period) {
if(cyclic) {
cycle_start = game_time - fmodf(game_time - cycle_start, period);
@@
-58,4
+59,3
@@
Timer::check()
return false;
}
return false;
}
-