moved and sorted worldmap tiles

[supertux.git] / src / title.cpp

diff --git a/src/title.cpp b/src/title.cpp
index 2f99169..537ff96 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -33,32 +33,32 @@
 #include <SDL_image.h>
 #include <physfs.h>
 
-#include "title.h"
-#include "video/screen.h"
-#include "video/surface.h"
-#include "audio/sound_manager.h"
-#include "gui/menu.h"
-#include "timer.h"
-#include "lisp/lisp.h"
-#include "lisp/parser.h"
-#include "level.h"
-#include "level_subset.h"
-#include "game_session.h"
-#include "worldmap.h"
-#include "player_status.h"
-#include "tile.h"
-#include "sector.h"
-#include "object/tilemap.h"
-#include "object/camera.h"
-#include "object/player.h"
-#include "resources.h"
-#include "gettext.h"
-#include "misc.h"
-#include "textscroller.h"
-#include "file_system.h"
-#include "control/joystickkeyboardcontroller.h"
-#include "control/codecontroller.h"
-#include "main.h"
+#include "title.hpp"
+#include "video/screen.hpp"
+#include "video/surface.hpp"
+#include "audio/sound_manager.hpp"
+#include "gui/menu.hpp"
+#include "timer.hpp"
+#include "lisp/lisp.hpp"
+#include "lisp/parser.hpp"
+#include "level.hpp"
+#include "level_subset.hpp"
+#include "game_session.hpp"
+#include "worldmap.hpp"
+#include "player_status.hpp"
+#include "tile.hpp"
+#include "sector.hpp"
+#include "object/tilemap.hpp"
+#include "object/camera.hpp"
+#include "object/player.hpp"
+#include "resources.hpp"
+#include "gettext.hpp"
+#include "misc.hpp"
+#include "textscroller.hpp"
+#include "file_system.hpp"
+#include "control/joystickkeyboardcontroller.hpp"
+#include "control/codecontroller.hpp"
+#include "main.hpp"
 
 static Surface* bkg_title;
 static Surface* logo;
@@ -181,6 +181,7 @@ void check_levels_contrib_menu()
   if(subset.has_worldmap) {
     WorldMapNS::WorldMap worldmap;
     worldmap.set_map_filename(subset.get_worldmap_filename());
+    sound_manager->stop_music();
 
     // some fading
     fadeout(256);
@@ -227,6 +228,7 @@ void check_contrib_subset_menu()
   int index = contrib_subset_menu->check();
   if (index != -1) {
     if (contrib_subset_menu->get_item_by_id(index).kind == MN_ACTION) {
+      sound_manager->stop_music();
       GameSession session(
           current_contrib_subset->get_level_filename(index), ST_GL_PLAY);
       session.run();
@@ -308,7 +310,7 @@ void title()
       // Calculate the movement-factor
       Uint32 ticks = SDL_GetTicks();
       float elapsed_time = float(ticks - lastticks) / 1000.;
-      global_time += elapsed_time;
+      game_time += elapsed_time;
       lastticks = ticks;
       // 40fps is minimum
       if(elapsed_time > .04)
@@ -377,9 +379,11 @@ void title()
                 }
 #endif
                 case MNID_CREDITS:
+                  sound_manager->stop_music();
                   fadeout(500);
                   sound_manager->play_music("music/credits.ogg");
                   display_text_file("credits.txt");
+                  sound_manager->stop_music();
                   fadeout(500);
                   Menu::set_current(main_menu);
                   break;