diff options
| -rw-r--r-- | assets/music/ozone.wav | bin | 0 -> 13013036 bytes | |||
| -rw-r--r-- | assets/music/theme.wav | bin | 0 -> 23175212 bytes | |||
| -rw-r--r-- | assets/music/theme_jazz.wav | bin | 0 -> 13193260 bytes | |||
| -rw-r--r-- | src/gameplay.cpp | 2 | ||||
| -rw-r--r-- | src/world.cpp | 9 |
5 files changed, 5 insertions, 6 deletions
diff --git a/assets/music/ozone.wav b/assets/music/ozone.wav Binary files differnew file mode 100644 index 0000000..6cc2416 --- /dev/null +++ b/assets/music/ozone.wav diff --git a/assets/music/theme.wav b/assets/music/theme.wav Binary files differnew file mode 100644 index 0000000..8b4ea47 --- /dev/null +++ b/assets/music/theme.wav diff --git a/assets/music/theme_jazz.wav b/assets/music/theme_jazz.wav Binary files differnew file mode 100644 index 0000000..1c62bbc --- /dev/null +++ b/assets/music/theme_jazz.wav diff --git a/src/gameplay.cpp b/src/gameplay.cpp index 69ae2cc..0ee6055 100644 --- a/src/gameplay.cpp +++ b/src/gameplay.cpp @@ -109,7 +109,7 @@ void initEverything(void){ worldSpawnHill2 = new World(); worldSpawnHill2->generate(700); worldSpawnHill2->setBackground(BG_FOREST); - worldSpawnHill2->setBGM("assets/music/embark.wav"); + worldSpawnHill2->setBGM("assets/music/ozone.wav"); worldSpawnHill2->addMob(MS_TRIGGER,-400,0,worldSpawnHill2_infoSprint); worldSpawnHill3 = new World(); 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; |