projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7be55d4
)
Fix music not properly fading in again
author
Tobias Markus
<tobbi@mozilla-uk.org>
Fri, 20 Mar 2015 16:16:50 +0000
(17:16 +0100)
committer
Tobias Markus
<tobbi@mozilla-uk.org>
Fri, 20 Mar 2015 16:16:50 +0000
(17:16 +0100)
src/audio/sound_manager.cpp
patch
|
blob
|
history
diff --git
a/src/audio/sound_manager.cpp
b/src/audio/sound_manager.cpp
index
3740d71
..
9141f6f
100644
(file)
--- a/
src/audio/sound_manager.cpp
+++ b/
src/audio/sound_manager.cpp
@@
-303,7
+303,7
@@
SoundManager::play_music(const std::string& filename, bool fade)
void
SoundManager::pause_music(float fadetime)
{
- if(music_source == NULL
|| !music_source->playing()
)
+ if(music_source == NULL)
return;
if(fadetime > 0) {
@@
-318,7
+318,7
@@
SoundManager::pause_music(float fadetime)
void
SoundManager::resume_music(float fadetime)
{
- if(music_source == NULL
|| !music_source->paused()
)
+ if(music_source == NULL)
return;
if(fadetime > 0) {