From fc3488fa8b2fa21e8921a6bdbdec590b6e6c6276 Mon Sep 17 00:00:00 2001 From: Ziemas Date: Thu, 3 Nov 2022 23:28:12 +0100 Subject: [PATCH] Properly update VAG volume (#2002) --- game/overlord/iso.cpp | 3 +-- game/overlord/iso.h | 1 + game/overlord/ssound.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/game/overlord/iso.cpp b/game/overlord/iso.cpp index 0f70c74fbf..0f47305485 100644 --- a/game/overlord/iso.cpp +++ b/game/overlord/iso.cpp @@ -41,7 +41,6 @@ static s32 CheckVAGStreamProgress(VagCommand* vag); static void StopVAG(VagCommand* vag); static void PauseVAG(VagCommand* vag); static void UnpauseVAG(VagCommand* vag); -static void SetVAGVol(); static s32 GetPlayPos(); static void UpdatePlayPos(); static void VAG_MarkLoopEnd(void* data, u32 size); @@ -1254,7 +1253,7 @@ static void UnpauseVAG(VagCommand* vag) { } } -static void SetVAGVol() { +void SetVAGVol() { if (gVAGCMD && gVAGCMD->started && !gVAGCMD->paused) { s32 left = 0, right = 0; CalculateVAGVolumes(gVAGCMD->volume, gVAGCMD->positioned, &gVAGCMD->trans, &left, &right); diff --git a/game/overlord/iso.h b/game/overlord/iso.h index 7962d342c7..456b5fa221 100644 --- a/game/overlord/iso.h +++ b/game/overlord/iso.h @@ -33,3 +33,4 @@ u32 GetISOFileLength(FileRecord* f); u32 InitISOFS(const char* fs_mode, const char* loading_screen); VagDirEntry* FindVAGFile(const char* name); s32 GetVAGStreamPos(); +void SetVAGVol(); diff --git a/game/overlord/ssound.cpp b/game/overlord/ssound.cpp index 99574f7af1..886dc51395 100644 --- a/game/overlord/ssound.cpp +++ b/game/overlord/ssound.cpp @@ -5,6 +5,7 @@ #include "common/util/Assert.h" +#include "game/overlord/iso.h" #include "game/overlord/srpc.h" #include "game/sound/sndshim.h" @@ -456,7 +457,7 @@ void SetEarTrans(Vec3w* ear_trans, Vec3w* cam_trans, s32 cam_angle) { } } - // TODO SetVAGVol(); + SetVAGVol(); } void PrintActiveSounds() {