- moved time_left timer into gamesession

SVN-Revision: 478

diff --git a/src/gameloop.h b/src/gameloop.h
index 203306e..7aeeec5 100644 (file)
--- a/src/gameloop.h
+++ b/src/gameloop.h
@@ -53,6 +53,8 @@ class GameSession
   int levelnb;
 
  public:
+  timer_type time_left;
+
   GameSession();
   GameSession(const std::string& filename);
   GameSession(const std::string& subset, int levelnb, int mode);

diff --git a/src/player.cpp b/src/player.cpp
index 607e8ae..af3df7b 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -253,8 +253,6 @@ Player::action(double frame_ratio)
   /* ---- DONE HANDLING TUX! --- */
 
   /* Handle invincibility timer: */
-
-
   if (get_current_music() == HERRING_MUSIC && !timer_check(&invincible_timer))
     {
       /*
@@ -263,8 +261,8 @@ Player::action(double frame_ratio)
          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

diff --git a/src/scene.cpp b/src/scene.cpp
index a4cb095..2ed15f4 100644 (file)
--- a/src/scene.cpp
+++ b/src/scene.cpp
@@ -20,7 +20,5 @@ float scroll_x;
 
 unsigned int global_frame_counter;
 
-timer_type time_left;
-
 // EOF //
 

diff --git a/src/scene.h b/src/scene.h
index c9547c3..a517b8e 100644 (file)
--- a/src/scene.h
+++ b/src/scene.h
@@ -32,6 +32,4 @@ extern PlayerStatus player_status;
 extern float scroll_x;
 extern unsigned int global_frame_counter;
 
-extern timer_type time_left;
-
 #endif /*SUPERTUX_SCENE_H*/