AudioSystem names from BBA, cleanup

This commit is contained in:
robojumper
2025-07-26 22:33:49 +02:00
parent 1be399e999
commit b8ba5a956c
14 changed files with 168 additions and 96 deletions
+20 -20
View File
@@ -8,47 +8,47 @@ namespace EGG {
AudioSystem *AudioSystem::sInstanse;
AudioSystem::AudioSystem() {
field_0x00 = 1.0f;
field_0x08 = 0;
field_0x04 = 0;
mSavedMasterVolume = 1.0f;
mShutdownStatus = 0;
mResetStatus = 0;
sInstanse = this;
}
AudioSystem::~AudioSystem() {}
void AudioSystem::fn_804B7270(s32 frame) {
if (field_0x08 == 0 && field_0x04 == 0) {
field_0x00 = nw4r::snd::SoundSystem::GetMasterVolume();
nw4r::snd::SoundSystem::SetMasterVolume(0.0f, frame * 16.666667f);
field_0x04 = 1;
void AudioSystem::reset(s32 ms) {
if (mShutdownStatus == 0 && mResetStatus == 0) {
mSavedMasterVolume = nw4r::snd::SoundSystem::GetMasterVolume();
nw4r::snd::SoundSystem::SetMasterVolume(0.0f, ms * 16.666667f);
mResetStatus = 1;
}
}
void AudioSystem::fn_804B7370() {
if (field_0x08 == 0) {
nw4r::snd::SoundSystem::SetMasterVolume(field_0x00, 0);
field_0x04 = 0;
void AudioSystem::recoverReset() {
if (mShutdownStatus == 0) {
nw4r::snd::SoundSystem::SetMasterVolume(mSavedMasterVolume, 0);
mResetStatus = 0;
}
}
void AudioSystem::fn_804B73D0(s32 frame) {
if (field_0x08 == 0) {
field_0x08 = 1;
nw4r::snd::SoundSystem::SetMasterVolume(0.0f, frame * 16.666667f);
void AudioSystem::shutdown(s32 ms) {
if (mShutdownStatus == 0) {
mShutdownStatus = 1;
nw4r::snd::SoundSystem::SetMasterVolume(0.0f, ms * 16.666667f);
}
}
void AudioSystem::calc() {
f32 masterVolume = nw4r::snd::SoundSystem::GetMasterVolume();
if (field_0x08 == 1 && masterVolume == 0.0f) {
if (mShutdownStatus == 1 && masterVolume == 0.0f) {
nw4r::snd::SoundSystem::PrepareReset();
nw4r::snd::SoundSystem::WaitForResetReady();
field_0x08 = 2;
mShutdownStatus = 2;
}
if (field_0x08 != 2 && field_0x04 == 1 && masterVolume == 0.0f) {
field_0x04 = 2;
if (mShutdownStatus != 2 && mResetStatus == 1 && masterVolume == 0.0f) {
mResetStatus = 2;
}
}