Properly update VAG volume (#2002)

This commit is contained in:
Ziemas 2022-11-03 23:28:12 +01:00 committed by GitHub
parent 21ad7904c0
commit fc3488fa8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions

View File

@ -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);

View File

@ -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();

View File

@ -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() {