Fixed Rocks being flagged as on the ground while they are carried

[supertux.git] / src / game_session.cpp

diff --git a/src/game_session.cpp b/src/game_session.cpp
index 21c0f54..f1b6108 100644 (file)
--- a/src/game_session.cpp
+++ b/src/game_session.cpp
@@ -73,6 +73,7 @@
 #include "object/endsequence_walkleft.hpp"
 #include "object/endsequence_fireworks.hpp"
 #include "direction.hpp"
+#include "scripting/time_scheduler.hpp"
 
 // the engine will be run with a logical framerate of 64fps.
 // We chose 64fps here because it is a power of 2, so 1/64 gives an "even"
@@ -97,6 +98,7 @@ GameSession::GameSession(const std::string& levelfile_, Statistics* statistics)
   currentsector = NULL;
 
   game_pause = false;
+  speed_before_pause = main_loop->get_speed();
 
   statistics_backdrop.reset(new Surface("images/engine/menu/score-backdrop.png"));
 
@@ -146,6 +148,7 @@ GameSession::restart_level()
 
   //levelintro();
 
+  sound_manager->stop_music();
   currentsector->play_music(LEVEL_MUSIC);
 
   if(capture_file != "") {
@@ -276,7 +279,9 @@ GameSession::on_escape_press()
   if(currentsector->player->is_dying() || end_sequence)
   {
     // Let the timers run out, we fast-forward them to force past a sequence
-    if (end_sequence) end_sequence->stop();
+    if (end_sequence)
+      end_sequence->stop();
+
     currentsector->player->dying_timer.start(FLT_EPSILON);
     return;   // don't let the player open the menu, when he is dying
   }
@@ -292,11 +297,14 @@ GameSession::on_escape_press()
 void
 GameSession::toggle_pause()
 {
-  if(Menu::current() == NULL) {
+  if(!game_pause) {
+    speed_before_pause = main_loop->get_speed();
+    main_loop->set_speed(0);
     Menu::set_current(game_menu.get());
     game_menu->set_active_item(MNID_CONTINUE);
     game_pause = true;
   } else {
+    main_loop->set_speed(speed_before_pause);
     Menu::set_current(NULL);
     game_pause = false;
   }
@@ -416,6 +424,7 @@ GameSession::process_menu()
       switch (game_menu->check()) {
         case MNID_CONTINUE:
           Menu::set_current(0);
+          toggle_pause();
           break;
         case MNID_ABORTLEVEL:
           Menu::set_current(0);
@@ -477,9 +486,9 @@ GameSession::update(float elapsed_time)
       currentsector->update(elapsed_time);
     } else {
       if (!end_sequence->is_tux_stopped()) {
-        currentsector->update(elapsed_time/2);
+        currentsector->update(elapsed_time);
       } else {
-        end_sequence->update(elapsed_time/2);
+        end_sequence->update(elapsed_time);
       }
     }
   }
@@ -587,39 +596,25 @@ GameSession::start_sequence(const std::string& sequencename)
   }
 
   // abort if a sequence is already playing
-  if (end_sequence) return;
+  if (end_sequence)
+         return;
 
   if (sequencename == "endsequence") {
-
-    // Determine walking direction for Tux
-    /*float xst = 1.f, xend = 2.f;
-    for(std::vector<GameObject*>::iterator i = currentsector->gameobjects.begin(); i != currentsector->gameobjects.end(); i++) {
-      SequenceTrigger* st = dynamic_cast<SequenceTrigger*>(*i);
-      if(!st)
-       continue;
-      if(st->get_sequence_name() == "stoptux")
-       xend = st->get_pos().x;
-      else if(st->get_sequence_name() == "endsequence")
-       xst = st->get_pos().y;
-    }
-
-    if (xst > xend) {
-      end_sequence = new EndSequenceWalkLeft();
-    } else {
-      end_sequence = new EndSequenceWalkRight();
-    }*/
     if (currentsector->get_players()[0]->physic.get_velocity_x() < 0) {
       end_sequence = new EndSequenceWalkLeft();
     } else {
       end_sequence = new EndSequenceWalkRight();
     }
-  }
-  else if (sequencename == "fireworks") end_sequence = new EndSequenceFireworks();
-  else {
+  } else if (sequencename == "fireworks") {
+    end_sequence = new EndSequenceFireworks();
+  } else {
     log_warning << "Unknown sequence '" << sequencename << "'. Ignoring." << std::endl;
     return;
   }
 
+  /* slow down the game for end-sequence */
+  main_loop->set_speed(0.5f);
+
   currentsector->add_object(end_sequence);
   end_sequence->start();