summaryrefslogtreecommitdiff
path: root/src/koopatlas
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-10-23 18:25:09 +0200
committerTreeki <treeki@gmail.com>2012-10-23 18:25:09 +0200
commitb0cfb5363c39a30eb4daf34e6dd162ed717541d4 (patch)
treeabc7c4e3dd299b9ee22e853ef7013b536e9d1692 /src/koopatlas
parent20aa16033547f5a1f0b5032f0c17acf32cbbc7f5 (diff)
downloadkamek-b0cfb5363c39a30eb4daf34e6dd162ed717541d4.tar.gz
kamek-b0cfb5363c39a30eb4daf34e6dd162ed717541d4.zip
yay fading
Diffstat (limited to 'src/koopatlas')
-rw-r--r--src/koopatlas/core.cpp2
-rw-r--r--src/koopatlas/pathmanager.cpp5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/koopatlas/core.cpp b/src/koopatlas/core.cpp
index 252d9a6..e4e3c07 100644
--- a/src/koopatlas/core.cpp
+++ b/src/koopatlas/core.cpp
@@ -453,7 +453,7 @@ void dScKoopatlas_c::setBGMTrack(int trackID) {
int dScKoopatlas_c::onDelete() {
if (bgm.Exists())
- bgm.Stop(5);
+ bgm.Stop(0);
FreeScene(0);
FreeScene(1);
diff --git a/src/koopatlas/pathmanager.cpp b/src/koopatlas/pathmanager.cpp
index 6b28d66..87725bd 100644
--- a/src/koopatlas/pathmanager.cpp
+++ b/src/koopatlas/pathmanager.cpp
@@ -777,6 +777,11 @@ void dWMPathManager_c::activatePoint() {
isEnteringLevel = true;
levelStartWait = 40;
enteredLevel = dLevelInfo_c::s_info.searchBySlot(w, l);
+
+ if (dScKoopatlas_c::instance->bgm.Exists()) {
+ dScKoopatlas_c::instance->bgm.Stop(50);
+ dScKoopatlas_c::instance->bgm.DetachSound();
+ }
}
}