hatch door trigger files

[supertux.git] / src / title.cpp

diff --git a/src/title.cpp b/src/title.cpp
index 514479d..791cbfb 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -60,6 +60,7 @@
 #include "resources.h"
 #include "app/gettext.h"
 #include "misc.h"
+#include "textscroller.h"
 
 static Surface* bkg_title;
 static Surface* logo;
@@ -85,7 +86,7 @@ void resume_demo()
 {
   // FIXME: shouldn't be needed if GameSession
   // didn't relay on global variables
-  titlesession->get_current_sector()->activate();
+  titlesession->get_current_sector()->activate("main");
   titlesession->set_current();
 
   frame_rate.update();
@@ -214,7 +215,7 @@ void check_levels_contrib_menu()
     contrib_subset_menu->additem(MN_HL,"",0,0);      
     contrib_subset_menu->additem(MN_BACK, _("Back"), 0, 0);
 
-    titlesession->get_current_sector()->activate();
+    titlesession->get_current_sector()->activate("main");
     titlesession->set_current();
   }
 }
@@ -297,7 +298,7 @@ void title(void)
   logo = new Surface(datadir + "/images/title/logo.png", true);
   img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", true);
 
-  titlesession->get_current_sector()->activate();
+  titlesession->get_current_sector()->activate("main");
   titlesession->set_current();
 
   /* --- Main title loop: --- */
@@ -387,7 +388,7 @@ void title(void)
                   fadeout(500);
                   credits_music = SoundManager::get()->load_music(datadir + "/music/credits.ogg");
                   SoundManager::get()->play_music(credits_music);
-                  display_text_file("credits.txt", SCROLL_SPEED_CREDITS, white_big_text , white_text, white_small_text, blue_text );
+                  display_text_file("credits.txt");
                   fadeout(500);
                   Menu::set_current(main_menu);
                   break;