X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsupertux%2Ftitle_screen.cpp;h=27db44b1ed50cda5bd5606fb28b2eeb6fd2aab7d;hb=0dfc9395c709d05e0a6ef27ad825990413939aad;hp=7b687b1eff3220d1a48f3962b37108c31fa4f24f;hpb=7824178a3691f70975f01a5dd46da9c40c6269f4;p=supertux.git

diff --git a/src/supertux/title_screen.cpp b/src/supertux/title_screen.cpp
index 7b687b1ef..27db44b1e 100644
--- a/src/supertux/title_screen.cpp
+++ b/src/supertux/title_screen.cpp
@@ -40,14 +40,14 @@
 #include <sstream>
 #include <version.h>
 
-TitleScreen::TitleScreen(PlayerStatus* player_status) :
+TitleScreen::TitleScreen(Savegame& savegame) :
   frame(),
   controller(),
   titlesession(),
   copyright_text()
 {
   controller.reset(new CodeController());
-  titlesession.reset(new GameSession("levels/misc/menu.stl", player_status));
+  titlesession.reset(new GameSession("levels/misc/menu.stl", savegame));
 
   Player* player = titlesession->get_current_sector()->player;
   player->set_controller(controller.get());
@@ -119,8 +119,10 @@ TitleScreen::draw(DrawingContext& context)
   Sector* sector  = titlesession->get_current_sector();
   sector->draw(context);
 
-  // FIXME: Add something to scale the frame to the resolution of the screen
-  //context.draw_surface(frame, Vector(0,0),LAYER_FOREGROUND1);
+  context.draw_surface_part(frame,
+                            Rectf(0, 0, frame->get_width(), frame->get_height()),
+                            Rectf(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT),
+                            LAYER_FOREGROUND1);
 
   context.draw_text(Resources::small_font,
                     copyright_text,
@@ -131,17 +133,15 @@ TitleScreen::draw(DrawingContext& context)
 void
 TitleScreen::update(float elapsed_time)
 {
-  g_screen_manager->set_speed(0.6f);
+  ScreenManager::current()->set_speed(0.6f);
   Sector* sector  = titlesession->get_current_sector();
   sector->update(elapsed_time);
 
   make_tux_jump();
 
-  MenuManager::instance().check_menu();
-
   // reopen menu if user closed it (so that the app doesn't close when user
   // accidently hit ESC)
-  if(!MenuManager::instance().is_active() && g_screen_manager->has_no_pending_fadeout())
+  if(!MenuManager::instance().is_active() && !ScreenManager::current()->has_pending_fadeout())
   {
     MenuManager::instance().set_menu(MenuStorage::MAIN_MENU);
   }