X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgame_session.cpp;h=fbeac4ea7b6768a2fe6cae88234cb11e981b3d78;hb=c1583b50b204a0c9e50c7b7750db50d24ff5f6fa;hp=1b7bc41dd0832cd52c2bf104899321fa0d1d7319;hpb=249d7138cb5c5e071c563a03f4955942cf997dde;p=supertux.git

diff --git a/src/game_session.cpp b/src/game_session.cpp
index 1b7bc41dd..fbeac4ea7 100644
--- a/src/game_session.cpp
+++ b/src/game_session.cpp
@@ -184,8 +184,6 @@ GameSession::play_demo(const std::string& filename)
 void
 GameSession::levelintro()
 {
-  //sound_manager->halt_music();
-  
   char str[60];
 
   DrawingContext context;
@@ -429,7 +427,6 @@ GameSession::update(float elapsed_time)
 
   // update sounds
   sound_manager->set_listener_position(currentsector->player->get_pos());
-  sound_manager->update();
 }
 
 void 
@@ -531,7 +528,7 @@ GameSession::run()
     static const float elapsed_time = 1.0 / LOGICAL_FPS;
     // old code... float elapsed_time = float(ticks - lastticks) / 1000.;
     if(!game_pause)
-      global_time += elapsed_time;
+      game_time += elapsed_time;
 
     // regulate fps
     ticks = SDL_GetTicks();
@@ -593,6 +590,9 @@ GameSession::run()
     if(!skipdraw)
       draw();
 
+    // update sounds
+    sound_manager->update();
+
     /* Time stops in pause mode */
     if(game_pause || Menu::current())
     {
@@ -799,6 +799,7 @@ bool process_load_game_menu()
   stream << slot;
   std::string slotfile = "save/slot" + stream.str() + ".stsg";
 
+  sound_manager->stop_music();
   fadeout(256);
   DrawingContext context;
   context.draw_text(white_text, "Loading...",