From 4be130f3e0cb361e3a92db0216525b18b7c00afe Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sat, 13 Apr 2024 17:17:28 -0400 Subject: [PATCH] fix bad indentation --- .../JStudio/JStudio_JAudio/object-sound.cpp | 57 +++++++++---------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/src/JSystem/JStudio/JStudio_JAudio/object-sound.cpp b/src/JSystem/JStudio/JStudio_JAudio/object-sound.cpp index 0e6912220..3b5da8ba5 100644 --- a/src/JSystem/JStudio/JStudio_JAudio/object-sound.cpp +++ b/src/JSystem/JStudio/JStudio_JAudio/object-sound.cpp @@ -46,19 +46,19 @@ void TAdaptor_sound::adaptor_do_prepare(const JStudio::TObject* param_1) { TAdaptor_sound::TVVOOn_BEGIN_FADE_IN_ TAdaptor_sound::soVVOOn_BEGIN_FADE_IN_; TAdaptor_sound::TVVOOn_END_FADE_OUT_ TAdaptor_sound::soVVOOn_END_FADE_OUT_; TAdaptor_sound::TVVOSetValue_ TAdaptor_sound::saoVVOSetValue_[] = { - TAdaptor_sound::TVVOSetValue_(UNK_6_e, &JAISound::setDemoVolume), + TAdaptor_sound::TVVOSetValue_(UNK_6_e, &JAISound::setDemoVolume), TAdaptor_sound::TVVOSetValue_(UNK_7_e, &JAISound::setDemoPan), - TAdaptor_sound::TVVOSetValue_(UNK_8_e, &JAISound::setDemoPitch), + TAdaptor_sound::TVVOSetValue_(UNK_8_e, &JAISound::setDemoPitch), TAdaptor_sound::TVVOSetValue_(UNK_9_e, &JAISound::setTempoProportion), - TAdaptor_sound::TVVOSetValue_(UNK_A_e, &JAISound::setDemoFxmix), + TAdaptor_sound::TVVOSetValue_(UNK_A_e, &JAISound::setDemoFxmix), TAdaptor_sound::TVVOSetValue_(UNK_MINUS1_e, NULL), }; /* 80278F40-80278FB8 .text adaptor_do_update__Q214JStudio_JAudio14TAdaptor_soundFPCQ27JStudio7TObjectUl */ void TAdaptor_sound::adaptor_do_update(const JStudio::TObject* object, u32) { - JStudio::TControl* control = (JStudio::TControl*)object->getControl(); + JStudio::TControl* control = (JStudio::TControl*)object->getControl(); Vec* r30 = &_F8; - adaptor_getVariableValue_Vec(r30, sauVariableValue_3_POSITION_XYZ); + adaptor_getVariableValue_Vec(r30, sauVariableValue_3_POSITION_XYZ); if (control->mTransformOnSet) { Vec temp; PSMTXMultVec(control->mTransformOnSet_Matrix, r30, &temp); @@ -68,43 +68,42 @@ void TAdaptor_sound::adaptor_do_update(const JStudio::TObject* object, u32) { /* 80278FB8-80279064 .text adaptor_do_SOUND__Q214JStudio_JAudio14TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */ void TAdaptor_sound::adaptor_do_SOUND(JStudio::data::TEOperationData op, const void* data, u32) { - switch (op) { - case JStudio::data::UNK_0x19: - u32 flags = *(s32*)data; - if (flags & 0xc0000000) { - if (mpSound) { - mpSound->stop(0); - } + switch (op) { + case JStudio::data::UNK_0x19: + u32 flags = *(s32*)data; + if (flags & 0xc0000000) { + if (mpSound) { + mpSound->stop(0); + } mFlags = flags; mpBasic->startSoundVec(flags, &mpSound, mPosition, 0, 0, 4); if (mpSound) { mpSound->setPrepareFlag(1); } - if (!mpSound) { + if (!mpSound) { return; - } - } else { + } + } else { mFlags = *(s32*)data; } - } + } } /* 80279064-8027908C .text adaptor_do_LOCATED__Q214JStudio_JAudio14TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */ void TAdaptor_sound::adaptor_do_LOCATED(JStudio::data::TEOperationData op, const void* data, u32 flag) { - switch (op) { - case JStudio::data::UNK_0x2: - Vec* pos = *(Vec**)data; - mPosition = NULL; - if (!pos) - return; - mPosition = &_F8; - break; - } + switch (op) { + case JStudio::data::UNK_0x2: + Vec* pos = *(Vec**)data; + mPosition = NULL; + if (!pos) + return; + mPosition = &_F8; + break; + } } /* 8027908C-8027915C .text __cl__Q314JStudio_JAudio14TAdaptor_sound21TVVOOn_BEGIN_FADE_IN_CFfPQ27JStudio8TAdaptor */ void TAdaptor_sound::TVVOOn_BEGIN_FADE_IN_::operator()(f32 value, JStudio::TAdaptor* adaptor) const { - /* Nonmatching */ JStudio_JAudio::TAdaptor_sound* adaptor_sound = (JStudio_JAudio::TAdaptor_sound*)adaptor; JAISound* sound = adaptor_sound->mpSound; u32 flags = adaptor_sound->mFlags; @@ -119,9 +118,9 @@ void TAdaptor_sound::TVVOOn_BEGIN_FADE_IN_::operator()(f32 value, JStudio::TAdap } } adaptor_sound->mpBasic->startSoundVec(flags, &adaptor_sound->mpSound, adaptor_sound->mPosition, value, 0, 4); - if (!adaptor_sound->mpSound) { - return; - } + if (!adaptor_sound->mpSound) { + return; + } } }