X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=94ccc5a0af2940e224c58c8797ae2c814b0037ed;hb=c3f9468882de1fd44f41ccfa7dae6d776bf306a7;hp=266b28b9214c681ecb63e66b87b66152441ab732;hpb=b72c5d178e4cc95130735d8bf8716513c7cc28e1;p=supertux.git diff --git a/src/title.cpp b/src/title.cpp index 266b28b92..94ccc5a0a 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; @@ -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(); @@ -328,21 +329,21 @@ 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", Vector(0, SCREEN_HEIGHT - 50), LEFT_ALLIGN, LAYER_FOREGROUND1); context.draw_text(white_small_text, _( -"Copyright (c) 2005 SuperTux Devel Team\n" +"Copyright (c) 2006 SuperTux Devel Team\n" "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to\n" "redistribute it under certain conditions; see the file COPYING for details.\n" ),