projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed background drawing problems introduced with my last commit
[supertux.git]
/
src
/
gameloop.h
diff --git
a/src/gameloop.h
b/src/gameloop.h
index
a5263d8
..
d1898be
100644
(file)
--- a/
src/gameloop.h
+++ b/
src/gameloop.h
@@
-57,7
+57,6
@@
class GameSession
{
private:
Uint32 fps_ticks;
{
private:
Uint32 fps_ticks;
- Timer2 frame_timer;
Timer2 endsequence_timer;
Level* level;
Sector* currentsector;
Timer2 endsequence_timer;
Level* level;
Sector* currentsector;
@@
-79,7
+78,7
@@
private:
bool game_pause;
bool game_pause;
- std::string level
nam
e;
+ std::string level
fil
e;
bool flip_level;
// the sector and spawnpoint we shoudl spawn after this frame
bool flip_level;
// the sector and spawnpoint we shoudl spawn after this frame
@@
-94,7
+93,8
@@
public:
DrawingContext* context;
Timer2 time_left;
DrawingContext* context;
Timer2 time_left;
- GameSession(const std::string& level, int mode, bool flip_level_ = false, Statistics* statistics = NULL);
+ GameSession(const std::string& levelfile, int mode, bool flip_level_ = false,
+ Statistics* statistics = 0);
~GameSession();
/** Enter the busy loop */
~GameSession();
/** Enter the busy loop */