projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for correct music playing after dying in a different sector
[supertux.git]
/
src
/
supertux
/
sector.cpp
diff --git
a/src/supertux/sector.cpp
b/src/supertux/sector.cpp
index
146db5a
..
351fe31
100644
(file)
--- a/
src/supertux/sector.cpp
+++ b/
src/supertux/sector.cpp
@@
-1500,7
+1500,14
@@
Sector::play_music(MusicType type)
void
Sector::resume_music()
{
void
Sector::resume_music()
{
- SoundManager::current()->resume_music(1.5f);
+ if(SoundManager::current()->get_current_music() == music)
+ {
+ SoundManager::current()->resume_music(1.5f);
+ }
+ else
+ {
+ SoundManager::current()->play_music(music, true);
+ }
}
MusicType
}
MusicType