X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsupertux%2Ftitle.cpp;h=b4b3e70f2883652a65c47cf81c798f6e54f24729;hb=abcb5a66b00aff23c5f1587646f9298fc0a9d8be;hp=72c6b9eb7b1edaae5f8c61b170128eee3a49ced2;hpb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;p=supertux.git

diff --git a/src/supertux/title.cpp b/src/supertux/title.cpp
index 72c6b9eb7..b4b3e70f2 100644
--- a/src/supertux/title.cpp
+++ b/src/supertux/title.cpp
@@ -52,6 +52,31 @@ enum MainMenuIDs {
   MNID_QUITMAINMENU
 };
 
+TitleScreen::TitleScreen() :
+  main_menu(),
+  contrib_menu(),
+  contrib_world_menu(),
+  main_world(),
+  contrib_worlds(),
+  addons_menu(),
+  addons(),
+  current_world(),
+  frame(),
+  controller(),
+  titlesession()
+{
+  controller.reset(new CodeController());
+  titlesession.reset(new GameSession("levels/misc/menu.stl"));
+
+  Player* player = titlesession->get_current_sector()->player;
+  player->set_controller(controller.get());
+  player->set_speedlimit(230); //MAX_WALK_XM
+
+  generate_main_menu();
+
+  frame = std::auto_ptr<Surface>(new Surface("images/engine/menu/frame.png"));
+}
+
 void
 TitleScreen::update_load_game_menu()
 {
@@ -305,20 +330,6 @@ TitleScreen::make_tux_jump()
   }
 }
 
-TitleScreen::TitleScreen()
-{
-  controller.reset(new CodeController());
-  titlesession.reset(new GameSession("levels/misc/menu.stl"));
-
-  Player* player = titlesession->get_current_sector()->player;
-  player->set_controller(controller.get());
-  player->set_speedlimit(230); //MAX_WALK_XM
-
-  generate_main_menu();
-
-  frame = std::auto_ptr<Surface>(new Surface("images/engine/menu/frame.png"));
-}
-
 void
 TitleScreen::generate_main_menu()
 {