projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed Rocks being flagged as on the ground while they are carried
[supertux.git]
/
src
/
title.cpp
diff --git
a/src/title.cpp
b/src/title.cpp
index
a990c69
..
2a34b10
100644
(file)
--- a/
src/title.cpp
+++ b/
src/title.cpp
@@
-303,7
+303,7
@@
TitleScreen::check_addons_menu()
addons_menu->set_active_item(index);
}
catch (std::runtime_error e) {
addons_menu->set_active_item(index);
}
catch (std::runtime_error e) {
- log_warning << "Check for available Add-ons failed
with error message \"" << e.what() << "\""
<< std::endl;
+ log_warning << "Check for available Add-ons failed
: " << e.what()
<< std::endl;
}
return;
}
}
return;
}
@@
-319,7
+319,7
@@
TitleScreen::check_addons_menu()
addons_menu->set_active_item(index);
}
catch (std::runtime_error e) {
addons_menu->set_active_item(index);
}
catch (std::runtime_error e) {
- log_warning << "Installation of Add-on failed
with error message \"" << e.what() << "\""
<< std::endl;
+ log_warning << "Installation of Add-on failed
: " << e.what()
<< std::endl;
}
} else {
try {
}
} else {
try {
@@
-329,7
+329,7
@@
TitleScreen::check_addons_menu()
addons_menu->set_active_item(index);
}
catch (std::runtime_error e) {
addons_menu->set_active_item(index);
}
catch (std::runtime_error e) {
- log_warning << "Removal of Add-on failed
with error message \"" << e.what() << "\""
<< std::endl;
+ log_warning << "Removal of Add-on failed
: " << e.what()
<< std::endl;
}
}
}
}
}
}
@@
-473,6
+473,7
@@
TitleScreen::update(float elapsed_time)
break;
case MNID_QUITMAINMENU:
main_loop->quit(new FadeOut(0.25));
break;
case MNID_QUITMAINMENU:
main_loop->quit(new FadeOut(0.25));
+ sound_manager->stop_music(0.25);
break;
}
} else if(menu == load_game_menu.get()) {
break;
}
} else if(menu == load_game_menu.get()) {