projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't die when main icon cannot be loaded
[supertux.git]
/
src
/
title.cpp
diff --git
a/src/title.cpp
b/src/title.cpp
index
bf5776a
..
dfd577c
100644
(file)
--- 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) {
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 "";
}
<< 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
#ifdef HAVE_LIBCURL
addons_menu->add_entry(0, std::string(_("Check Online")));
#else
- addons_menu->add_
de
active(0, std::string(_("Check Online (disabled)")));
+ addons_menu->add_
in
active(0, std::string(_("Check Online (disabled)")));
#endif
//addons_menu->add_hl();
#endif
//addons_menu->add_hl();
@@
-326,7
+326,7
@@
TitleScreen::make_tux_jump()
jumpWasReleased = true;
}
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 beginni
n
g
if(sector->get_width() - 320 < tux->get_pos().x) {
sector->activate("main");
sector->camera->reset(tux->get_pos());
if(sector->get_width() - 320 < tux->get_pos().x) {
sector->activate("main");
sector->camera->reset(tux->get_pos());
@@
-451,7
+451,7
@@
TitleScreen::update(float elapsed_time)
case MNID_QUITMAINMENU:
main_loop->quit(new FadeOut(0.25));
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()) {
break;
}
} else if(menu == contrib_menu.get()) {