aboutsummaryrefslogtreecommitdiffstats
path: root/src/world.cpp
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2015-12-15 21:20:01 -0500
committerClyne Sullivan <tullivan99@gmail.com>2015-12-15 21:20:01 -0500
commit7b1908e2bc2531de0b7e5ec81ab09b50ae14263f (patch)
tree616f7e02ae5b2d57181a9ccd1204987f7d4f597f /src/world.cpp
parente67bfdde0b7e15ac6bc29993a92a89a844474554 (diff)
music updates
Diffstat (limited to 'src/world.cpp')
-rw-r--r--src/world.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/world.cpp b/src/world.cpp
index 1b460a2..b964c9a 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -344,13 +344,12 @@ void World::setBGM(const char *path){
}
}
-void World::bgmPlay(World *prev){
- if(!prev || strcmp(bgm,prev->bgm)){
+void World::bgmPlay(World *prev){
+ if(prev && strcmp(bgm,prev->bgm)){
+ Mix_FadeOutMusic(800);
Mix_VolumeMusic(50);
Mix_PlayMusic(bgmObj,-1); // Loop infinitely
- }/*else{
- Mix_FadeOutMusic(800);
- }*/
+ }
}
int worldShade = 0;