X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=66ffb3c273b6fd73122e3af0265b0247ebd8f861;hb=d62647592b4ccffa89794af6fa03faaced46999d;hp=23107412989d0e6ff3523e207131db000ececb80;hpb=63ccedcdc3dd65f3677c012f3d3e6e6233e5b002;p=supertux.git

diff --git a/src/title.cpp b/src/title.cpp
index 231074129..66ffb3c27 100644
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -59,6 +59,7 @@
 #include "control/joystickkeyboardcontroller.hpp"
 #include "control/codecontroller.hpp"
 #include "main.hpp"
+#include "exceptions.hpp"
 
 static Surface* bkg_title;
 static Surface* logo;
@@ -82,7 +83,7 @@ static int current_subset = -1;
  */
 void resume_demo()
 {
-  player_status.reset();
+  player_status->reset();
   titlesession->get_current_sector()->activate("main");
   titlesession->set_current();
 
@@ -232,7 +233,7 @@ void check_contrib_subset_menu()
       GameSession session(
           current_contrib_subset->get_level_filename(index), ST_GL_PLAY);
       session.run();
-      player_status.reset();
+      player_status->reset();
       Menu::set_current(main_menu);
       resume_demo();
     }
@@ -285,9 +286,9 @@ void title()
   titlesession = new GameSession("levels/misc/menu.stl", ST_GL_DEMO_GAME);
 
   /* Load images: */
-  bkg_title = new Surface("images/background/arctis.jpg", false);
-  logo = new Surface("images/engine/menu/logo.png", true);
-  //img_choose_subset = new Surface("images/status/choose-level-subset.png", true);
+  bkg_title = new Surface("images/background/arctis.jpg");
+  logo = new Surface("images/engine/menu/logo.png");
+  //img_choose_subset = new Surface("images/status/choose-level-subset.png");
 
   titlesession->get_current_sector()->activate("main");
   titlesession->set_current();
@@ -310,7 +311,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)
@@ -328,14 +329,14 @@ void title()
         }
         main_controller->process_event(event);
         if (event.type == SDL_QUIT)
-          throw std::runtime_error("Received window close");
+          throw graceful_shutdown();
       }
   
       /* Draw the background: */
       draw_demo(elapsed_time);
 
       if (Menu::current() == main_menu)
-        context.draw_surface(logo, Vector(SCREEN_WIDTH/2 - logo->w/2, 30),
+        context.draw_surface(logo, Vector(SCREEN_WIDTH/2 - logo->get_width()/2, 30),
             LAYER_FOREGROUND1+1);
 
       context.draw_text(white_small_text, " SuperTux " PACKAGE_VERSION "\n",