X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=a187aeaad9705fdad5d510f6030b5ecebbc907b5;hb=43db9a6c44b6ee544e7694d1bb234ba559b0849c;hp=bf5776a1f25ec41ee46caa8fe941a556e5e320d9;hpb=c686b6e6bc389edb08cef2215b0882b2b0ff4b4b;p=supertux.git diff --git a/src/title.cpp b/src/title.cpp index bf5776a1f..a187aeaad 100644 --- a/src/title.cpp +++ b/src/title.cpp @@ -149,7 +149,7 @@ TitleScreen::get_level_name(const std::string& filename) level->get("name", name); return name; } catch(std::exception& e) { - log_warning << "Problem getting name of '" << filename << "': " + log_warning << "Problem getting name of '" << filename << "': " << e.what() << std::endl; return ""; } @@ -231,7 +231,7 @@ TitleScreen::generate_addons_menu() #ifdef HAVE_LIBCURL addons_menu->add_entry(0, std::string(_("Check Online"))); #else - addons_menu->add_deactive(0, std::string(_("Check Online (disabled)"))); + addons_menu->add_inactive(0, std::string(_("Check Online (disabled)"))); #endif //addons_menu->add_hl(); @@ -326,7 +326,7 @@ TitleScreen::make_tux_jump() jumpWasReleased = true; } - // Wrap around at the end of the level back to the beginnig + // Wrap around at the end of the level back to the beginning if(sector->get_width() - 320 < tux->get_pos().x) { sector->activate("main"); sector->camera->reset(tux->get_pos()); @@ -395,15 +395,15 @@ TitleScreen::draw(DrawingContext& context) // FIXME: Add something to scale the frame to the resolution of the screen context.draw_surface(frame.get(), Vector(0,0),LAYER_FOREGROUND1); - context.draw_text(white_small_text, "SuperTux " PACKAGE_VERSION "\n", + context.draw_text(small_font, "SuperTux " PACKAGE_VERSION "\n", Vector(5, SCREEN_HEIGHT - 50), ALIGN_LEFT, LAYER_FOREGROUND1); - context.draw_text(white_small_text, + context.draw_text(small_font, _( "Copyright (c) 2007 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" ), - Vector(5, SCREEN_HEIGHT - 50 + white_small_text->get_height() + 5), + Vector(5, SCREEN_HEIGHT - 50 + small_font->get_height() + 5), ALIGN_LEFT, LAYER_FOREGROUND1); } @@ -451,7 +451,7 @@ TitleScreen::update(float elapsed_time) case MNID_QUITMAINMENU: main_loop->quit(new FadeOut(0.25)); - sound_manager->stop_music(0.25); + sound_manager->stop_music(0.25); break; } } else if(menu == contrib_menu.get()) {