diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2015-12-09 08:30:10 -0500 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2015-12-09 08:30:10 -0500 |
| commit | 0f6da32aa634cf4a89dbd205d8b0dd68d401aaec (patch) | |
| tree | 37aa748a5be2908c73bbb12ac5c5d3a5ac661b6d /src/world.cpp | |
| parent | 1d3ba18c99850996f0ba85d99e269270d42056bf (diff) | |
| parent | 4e3ceb550b26e3b7810b4493943db98918d7bef1 (diff) | |
Merge branch 'master' of http://github.com/tcsullivan/gamedev
Diffstat (limited to 'src/world.cpp')
| -rw-r--r-- | src/world.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/world.cpp b/src/world.cpp index cb5f3ec..2fd3591 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -285,6 +285,12 @@ void World::update(Player *p,unsigned int delta){ else if(e->vel.x > 0)e->left = false; } } + + if(ui::dialogImportant){ + Mix_FadeOutMusic(2000); + }else if(!Mix_PlayingMusic()){ + Mix_FadeInMusic(bgmObj,-1,2000); + } } void World::setBGM(const char *path){ |