X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgameloop.cpp;h=78b4a88e7cc94ec181ed8794c72a3ba8e2bf731d;hb=cdb879de1ef50e2d2fb1aead922775d202ddd114;hp=4e4c622bf673ab1d3246413bf0c9356e0e6cccfd;hpb=5a2b8d827208e8d5acc30567fb3ea6cc9c6470f5;p=supertux.git

diff --git a/src/gameloop.cpp b/src/gameloop.cpp
index 4e4c622bf..78b4a88e7 100644
--- a/src/gameloop.cpp
+++ b/src/gameloop.cpp
@@ -188,6 +188,7 @@ GameSession::on_escape_press()
   else if (!Menu::current())
     {
       Menu::set_current(game_menu);
+      st_pause_ticks_start();
     }
 }
 
@@ -217,7 +218,8 @@ GameSession::process_events()
           if (Menu::current())
             {
               Menu::current()->event(event);
-              st_pause_ticks_start();
+	      if(!Menu::current())
+	      st_pause_ticks_stop();
             }
 
           switch(event.type)
@@ -259,7 +261,18 @@ GameSession::process_events()
           if (Menu::current())
             {
               Menu::current()->event(event);
-              st_pause_ticks_start();
+	      if(!Menu::current())
+	      st_pause_ticks_stop();
+
+            /* Tell Tux that the keys are all down, otherwise
+               it could have nasty bugs, like going allways to the right
+               or whatever that key does */
+            Player& tux = *world->get_tux();
+            tux.key_event((SDLKey)keymap.jump, UP);
+            tux.key_event((SDLKey)keymap.duck, UP);
+            tux.key_event((SDLKey)keymap.left, UP);
+            tux.key_event((SDLKey)keymap.right, UP);
+            tux.key_event((SDLKey)keymap.fire, UP);
             }
           else
             {
@@ -424,6 +437,7 @@ GameSession::check_end_conditions()
       last_x_pos = -1;
       music_manager->play_music(level_end_song, 0);
       endsequence_timer.start(7000);
+      tux->invincible_timer.start(7000); //FIXME: Implement a winning timer for the end sequence (with special winning animation etc.)
     }
   else if(end_sequence && !endsequence_timer.check())
     {
@@ -440,11 +454,11 @@ GameSession::check_end_conditions()
       last_x_pos = -1;
       music_manager->play_music(level_end_song, 0);
       endsequence_timer.start(7000); // 5 seconds until we finish the map
+      tux->invincible_timer.start(7000); //FIXME: Implement a winning timer for the end sequence (with special winning animation etc.)
     }
   else if (!end_sequence && tux->is_dead())
     {
       player_status.bonus = PlayerStatus::NO_BONUS;
-      player_status.lives -= 1;             
 
       if (player_status.lives < 0)
         { // No more lives!?
@@ -540,17 +554,12 @@ GameSession::run()
 
   update_time = last_update_time = st_get_ticks();
 
-  /* Clear screen: */
-//  clearscreen(0, 0, 0);
-//  updatescreen();
-
   // Eat unneeded events
   SDL_Event event;
   while (SDL_PollEvent(&event)) {}
 
   draw();
 
-  float overlap = 0.0f;
   while (exit_status == NONE)
     {
       /* Calculate the movement-factor */
@@ -573,19 +582,12 @@ GameSession::run()
       // determistic and not different on different machines
       if(!game_pause && !Menu::current())
         {
-          frame_ratio *= game_speed;
-          frame_ratio += overlap;
-          while (frame_ratio > 0)
-            {
-              // Update the world
-              check_end_conditions();
-              if (end_sequence == ENDSEQUENCE_RUNNING)
-                action(.5f);
-              else if(end_sequence == NO_ENDSEQUENCE)
-                action(1.0f);
-              frame_ratio -= 1.0f;
-            }
-          overlap = frame_ratio;
+          // Update the world
+          check_end_conditions();
+          if (end_sequence == ENDSEQUENCE_RUNNING)
+             action(frame_ratio/2);
+          else if(end_sequence == NO_ENDSEQUENCE)
+             action(frame_ratio);
         }
       else
         {
@@ -615,22 +617,22 @@ GameSession::run()
         }
 
       /* Handle time: */
-      if (!time_left.check() && world->get_tux()->dying == DYING_NOT)
+      if (!time_left.check() && world->get_tux()->dying == DYING_NOT
+              && !end_sequence)
         world->get_tux()->kill(Player::KILL);
 
       /* Handle music: */
-      if(world->get_tux()->invincible_timer.check())
+      if(world->get_tux()->invincible_timer.check() && !end_sequence)
         {
-          if(world->get_music_type() != HERRING_MUSIC)
-            world->play_music(HERRING_MUSIC);
+          world->play_music(HERRING_MUSIC);
         }
       /* are we low on time ? */
-      else if (time_left.get_left() < TIME_WARNING)
+      else if (time_left.get_left() < TIME_WARNING && !end_sequence)
         {
           world->play_music(HURRYUP_MUSIC);
         }
       /* or just normal music? */
-      else if(world->get_music_type() != LEVEL_MUSIC)
+      else if(world->get_music_type() != LEVEL_MUSIC && !end_sequence)
         {
           world->play_music(LEVEL_MUSIC);
         }
@@ -692,7 +694,7 @@ GameSession::drawstatus()
   if (player_status.lives >= 5)
     {
       sprintf(str, "%dx", player_status.lives);
-      gold_text->draw(str, 585, 20);
+      gold_text->draw_align(str, 617, 20, A_RIGHT, A_TOP);
       tux_life->draw(565+(18*3), 20);
     }
   else