Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1575
Modified Files:
gameloop.h player.cpp scene.cpp scene.h
Log Message:
- moved time_left timer into gamesession
Index: scene.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/scene.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- scene.cpp 11 Apr 2004 15:28:26 -0000 1.19
+++ scene.cpp 11 Apr 2004 15:33:53 -0000 1.20
@@ -20,7 +20,5 @@
unsigned int global_frame_counter;
-timer_type time_left;
-
// EOF //
Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- player.cpp 11 Apr 2004 15:28:26 -0000 1.28
+++ player.cpp 11 Apr 2004 15:33:53 -0000 1.29
@@ -253,8 +253,6 @@
/* ---- DONE HANDLING TUX! --- */
/* Handle invincibility timer: */
-
-
if (get_current_music() == HERRING_MUSIC && !timer_check(&invincible_timer))
{
/*
@@ -263,8 +261,8 @@
but are we in hurry ?
*/
-
- if (timer_get_left(&time_left) < TIME_WARNING)
+ // FIXME: Move this to gamesession
+ if (timer_get_left(&GameSession::current()->time_left) < TIME_WARNING)
{
/* yes, we are in hurry
stop the herring_song, prepare to play the correct
Index: gameloop.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- gameloop.h 11 Apr 2004 15:28:26 -0000 1.36
+++ gameloop.h 11 Apr 2004 15:33:53 -0000 1.37
@@ -53,6 +53,8 @@
int levelnb;
public:
+ timer_type time_left;
+
GameSession();
GameSession(const std::string& filename);
GameSession(const std::string& subset, int levelnb, int mode);
Index: scene.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/scene.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- scene.h 11 Apr 2004 15:28:26 -0000 1.22
+++ scene.h 11 Apr 2004 15:33:53 -0000 1.23
@@ -32,6 +32,4 @@
extern float scroll_x;
extern unsigned int global_frame_counter;
-extern timer_type time_left;
-
#endif /*SUPERTUX_SCENE_H*/
|
