diff options
| author | Treeki <treeki@gmail.com> | 2013-02-28 05:52:08 +0100 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-02-28 05:52:08 +0100 |
| commit | 0a2acdf9ef641e01532b0cd7061ca844127f99a9 (patch) | |
| tree | 8b0a9d0c2f84d1c190708b0e99e2deb9d984df4d /src/koopatlas | |
| parent | f249d8d8dd3a820eef7fa88042b61b07ea4d0023 (diff) | |
| download | kamek-0a2acdf9ef641e01532b0cd7061ca844127f99a9.tar.gz kamek-0a2acdf9ef641e01532b0cd7061ca844127f99a9.zip | |
fix music stopping in some cases
Diffstat (limited to 'src/koopatlas')
| -rw-r--r-- | src/koopatlas/mapmusic.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/koopatlas/mapmusic.cpp b/src/koopatlas/mapmusic.cpp index 1bd8a68..480dd9e 100644 --- a/src/koopatlas/mapmusic.cpp +++ b/src/koopatlas/mapmusic.cpp @@ -28,10 +28,10 @@ void dKPMusic::play(int id) { if (s_playing) { // Switch track OSReport("Trying to switch to song %d (Current one is %d)...\n", id, s_song); - if (s_song == id || s_nextSong == id) { + if ((s_song == id && s_nextSong == -1) || s_nextSong == id) { OSReport("This song is already playing or is scheduled. Not gonna do that.\n"); - } else if (s_countdownToFadeIn >= 0) { - OSReport("There's already a track being faded in (CountdownToFadeIn=%d)\n", s_countdownToFadeIn); + //} else if (s_countdownToFadeIn >= 0) { + // OSReport("There's already a track being faded in (CountdownToFadeIn=%d)\n", s_countdownToFadeIn); } else if (s_countdownToSwitch >= 0) { OSReport("We were already going to switch tracks, but the rstm hasn't been changed yet, so the next song is being changed to this one\n"); s_nextSong = id; |