From e46b9fd64bfe675085d8117b4f7842fdf7d09bbb Mon Sep 17 00:00:00 2001 From: Treeki Date: Fri, 19 Oct 2012 03:03:11 +0200 Subject: fixed sounds --- src/koopatlas/pathmanager.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/koopatlas/pathmanager.cpp b/src/koopatlas/pathmanager.cpp index bb6cc52..9c6eb38 100644 --- a/src/koopatlas/pathmanager.cpp +++ b/src/koopatlas/pathmanager.cpp @@ -4,7 +4,7 @@ #include "koopatlas/player.h" #include -extern "C" void PlaySoundWithFunctionB4(void *spc, void *handle, int id, int unk); +extern "C" void PlaySoundWithFunctionB4(void *spc, nw4r::snd::SoundHandle *handle, int id, int unk); static u8 MaybeFinishingLevel[2] = {0xFF,0xFF}; @@ -332,7 +332,7 @@ void dWMPathManager_c::execute() { if (countdownToFadeIn <= 0) { unlockingAlpha = 0; - u32 something = 0; + nw4r::snd::SoundHandle something; PlaySoundWithFunctionB4(SoundRelatedClass, &something, SE_OBJ_GEN_LOAD, 1); } else { return; @@ -359,7 +359,7 @@ void dWMPathManager_c::execute() { if (unlockingAlpha == 255) { // we've reached the end unlockingAlpha = -1; - u32 something = 0; + nw4r::snd::SoundHandle something; PlaySoundWithFunctionB4(SoundRelatedClass, &something, SE_OBJ_GEN_NEW_COURSE, 1); waitAfterUnlock = 15; @@ -545,11 +545,11 @@ void dWMPathManager_c::startMovementTo(dKPPath_s *path) { if (Animations[id].initialEffect) SpawnEffect(Animations[id].initialEffect, 0, &player->pos, 0, &player->scale); if (Animations[id].initialSound != SE_NULL) { - u32 something = 0; + nw4r::snd::SoundHandle something; PlaySoundWithFunctionB4(SoundRelatedClass, &something, Animations[id].initialSound, 1); if (Animations[id].initialSound == SE_PLY_JUMP) { - u32 something2 = 0; + nw4r::snd::SoundHandle something2; PlaySoundWithFunctionB4(SoundRelatedClass, &something2, SE_VOC_MA_CS_JUMP, 1); } } @@ -754,16 +754,16 @@ void dWMPathManager_c::activatePoint() { SpammyReport("Toad House Flags: %x", conds); if (conds & 0xFF0) { - - u32 something = 0; + nw4r::snd::SoundHandle something; PlaySoundWithFunctionB4(SoundRelatedClass, &something, SE_SYS_INVALID, 1); - return; } + return; + } } - u32 something = 0; + nw4r::snd::SoundHandle something; PlaySoundWithFunctionB4(SoundRelatedClass, &something, SE_SYS_GAME_START, 1); - u32 something2 = 0; + nw4r::snd::SoundHandle something2; PlaySoundWithFunctionB4(SoundRelatedClass, &something2, SE_VOC_MA_CS_COURSE_IN_HARD, 1); daWMPlayer_c::instance->startAnimation(170, 1.2, 10.0, 0.0); -- cgit v1.2.3