projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved and sorted worldmap tiles
[supertux.git]
/
src
/
title.cpp
diff --git
a/src/title.cpp
b/src/title.cpp
index
2abc6e3
..
537ff96
100644
(file)
--- a/
src/title.cpp
+++ b/
src/title.cpp
@@
-181,6
+181,7
@@
void check_levels_contrib_menu()
if(subset.has_worldmap) {
WorldMapNS::WorldMap worldmap;
worldmap.set_map_filename(subset.get_worldmap_filename());
if(subset.has_worldmap) {
WorldMapNS::WorldMap worldmap;
worldmap.set_map_filename(subset.get_worldmap_filename());
+ sound_manager->stop_music();
// some fading
fadeout(256);
// some fading
fadeout(256);
@@
-227,6
+228,7
@@
void check_contrib_subset_menu()
int index = contrib_subset_menu->check();
if (index != -1) {
if (contrib_subset_menu->get_item_by_id(index).kind == MN_ACTION) {
int index = contrib_subset_menu->check();
if (index != -1) {
if (contrib_subset_menu->get_item_by_id(index).kind == MN_ACTION) {
+ sound_manager->stop_music();
GameSession session(
current_contrib_subset->get_level_filename(index), ST_GL_PLAY);
session.run();
GameSession session(
current_contrib_subset->get_level_filename(index), ST_GL_PLAY);
session.run();
@@
-308,7
+310,7
@@
void title()
// Calculate the movement-factor
Uint32 ticks = SDL_GetTicks();
float elapsed_time = float(ticks - lastticks) / 1000.;
// Calculate the movement-factor
Uint32 ticks = SDL_GetTicks();
float elapsed_time = float(ticks - lastticks) / 1000.;
- g
lobal
_time += elapsed_time;
+ g
ame
_time += elapsed_time;
lastticks = ticks;
// 40fps is minimum
if(elapsed_time > .04)
lastticks = ticks;
// 40fps is minimum
if(elapsed_time > .04)
@@
-377,9
+379,11
@@
void title()
}
#endif
case MNID_CREDITS:
}
#endif
case MNID_CREDITS:
+ sound_manager->stop_music();
fadeout(500);
sound_manager->play_music("music/credits.ogg");
display_text_file("credits.txt");
fadeout(500);
sound_manager->play_music("music/credits.ogg");
display_text_file("credits.txt");
+ sound_manager->stop_music();
fadeout(500);
Menu::set_current(main_menu);
break;
fadeout(500);
Menu::set_current(main_menu);
break;