forgot an assert

[supertux.git] / src / title.cpp

diff --git a/src/title.cpp b/src/title.cpp
index 5842cd4..2f99169 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -33,14 +33,10 @@
 #include <SDL_image.h>
 #include <physfs.h>
 
-#ifndef WIN32
-#include <sys/types.h>
-#include <ctype.h>
-#endif
-
 #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"
@@ -49,7 +45,6 @@
 #include "level_subset.h"
 #include "game_session.h"
 #include "worldmap.h"
-#include "leveleditor.h"
 #include "player_status.h"
 #include "tile.h"
 #include "sector.h"
@@ -79,6 +74,7 @@ static CodeController* controller;
 
 static std::vector<LevelSubset*> contrib_subsets;
 static LevelSubset* current_contrib_subset = 0;
+static int current_subset = -1;
 
 /* If the demo was stopped - because game started, level
    editor was excuted, etc - call this when you get back
@@ -111,6 +107,8 @@ void free_contrib_menu()
 
   contrib_subsets.clear();
   contrib_menu->clear();
+  current_contrib_subset = 0;
+  current_subset = -1;
 }
 
 void generate_contrib_menu()
@@ -174,8 +172,6 @@ std::string get_level_name(const std::string& filename)
 
 void check_levels_contrib_menu()
 {
-  static int current_subset = -1;
-
   int index = contrib_menu->check();
   if (index == -1)
     return;
@@ -282,7 +278,6 @@ void title()
 {
   walking = true;
   //LevelEditor* leveleditor;
-  MusicRef credits_music;
   controller = new CodeController();
 
   titlesession = new GameSession("levels/misc/menu.stl", ST_GL_DEMO_GAME);
@@ -383,9 +378,7 @@ void title()
 #endif
                 case MNID_CREDITS:
                   fadeout(500);
-                  credits_music = sound_manager->load_music(
-                      "/music/credits.ogg");
-                  sound_manager->play_music(credits_music);
+                  sound_manager->play_music("music/credits.ogg");
                   display_text_file("credits.txt");
                   fadeout(500);
                   Menu::set_current(main_menu);
@@ -440,6 +433,7 @@ void title()
       }
 
       context.do_drawing();
+      sound_manager->update();
 
       //frame_rate.update();