From 790e76d3731c98c59dc28a1a2b918ecdeb24bdde Mon Sep 17 00:00:00 2001 From: Treeki Date: Tue, 9 Apr 2013 22:27:45 +0200 Subject: only do the final part of the ending sequence once; some other minor fixes --- src/koopatlas/pathmanager.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/koopatlas/pathmanager.cpp') diff --git a/src/koopatlas/pathmanager.cpp b/src/koopatlas/pathmanager.cpp index 162084d..ad39c69 100644 --- a/src/koopatlas/pathmanager.cpp +++ b/src/koopatlas/pathmanager.cpp @@ -695,6 +695,8 @@ bool dWMPathManager_c::doingThings() { } void dWMPathManager_c::execute() { + dScKoopatlas_c *wm = dScKoopatlas_c::instance; + if (isEnteringLevel) { if (levelStartWait > 0) { levelStartWait--; @@ -724,7 +726,8 @@ void dWMPathManager_c::execute() { waitAfterInitialPlayerAnim = 38; nw4r::snd::SoundHandle something; - PlaySoundWithFunctionB4(SoundRelatedClass, &something, SE_VOC_MA_CS_JUMP, 1); + if (!wm->isEndingScene) + PlaySoundWithFunctionB4(SoundRelatedClass, &something, SE_VOC_MA_CS_JUMP, 1); } } } @@ -735,7 +738,7 @@ void dWMPathManager_c::execute() { waitAfterInitialPlayerAnim--; if (waitAfterInitialPlayerAnim == 0) daWMPlayer_c::instance->startAnimation(wait_select, 1.0f, 0.0f, 0.0f); - if (mustPlayAfterWinAnim && (waitAfterInitialPlayerAnim == 9)) { + if (mustPlayAfterWinAnim && (waitAfterInitialPlayerAnim == 9) && !wm->isEndingScene) { nw4r::snd::SoundHandle something; PlaySoundWithFunctionB4(SoundRelatedClass, &something, SE_PLY_LAND_ROCK, 1); } -- cgit v1.2.3