falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some more missing inline usages

This commit is contained in:
LagoLunatic 2025-12-24 18:47:03 -05:00
parent a6e89de918
commit 631cb79b3f
5 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/d/actor/d_a_mg_fish.cpp
View File

@ -1842,7 +1842,7 @@ static void mf_hit(mg_fish_class* i_this) {
i_this->mCurAction = ACTION_MG_FISH_MF_CATCH;
i_this->mActionPhase = 0;
g_dComIfG_gameInfo.play.mVibration.StartShock(4, 1, cXyz(0.0f, 1.0f, 0.0f));
Z2AudioMgr::getInterface()->changeBgmStatus(4);
Z2GetAudioMgr()->changeBgmStatus(4);
pvVar5->action = 6;
pvVar5->play_cam_mode = 10;
pvVar5->play_cam_timer = 0;
@ -2015,7 +2015,7 @@ static void mf_jump(mg_fish_class* i_this) {
fopAcM_effSmokeSet1(&i_this->field_0xc34, &i_this->field_0xc38, &i_this->actor.current.pos,
NULL, 0.6f * i_this->mJointScale, &i_this->actor.tevStr, 1);
Z2AudioMgr::getInterface()->seStart(Z2SE_OBJ_NIOIMASU_BOUND, (Vec*)&i_this->actor.current,
Z2GetAudioMgr()->seStart(Z2SE_OBJ_NIOIMASU_BOUND, &i_this->actor.current.pos,
0x14, 0,1.0f, 1.0f,
-1.0f, -1.0f, 0);
}
@ -2459,7 +2459,7 @@ static s32 mf_esa_catch(mg_fish_class* i_this) {
position = i_this->actor.current.pos;
position.y = i_this->mSurfaceY;
fopKyM_createWpillar(&position, 0.7f, 0);
Z2AudioMgr::getInterface()->changeFishingBgm(4);
Z2GetAudioMgr()->changeFishingBgm(4);
i_this->mActionPhase = 1;
i_this->mBobAmp = 50.0f;
i_this->mSound.startCreatureSound(Z2SE_AL_FISH_CATCH, 0, -1);

5
src/d/actor/d_a_obj_dmelevator.cpp
View File

@ -589,10 +589,7 @@ int daObjDmElevator_c::demoProc() {
void daObjDmElevator_c::moveInit() {
speedF = 0.0f;
if (field_0x5e0 == 0) {
s8 i_reverb = dComIfGp_getReverb(fopAcM_GetRoomNo(this));
Z2AudioMgr::mAudioMgrPtr->seStart(Z2SE_OBJ_ELEVATOR_START, (Vec*)&eyePos, 0, i_reverb, 1.0,
1.0, -1.0, -1.0, 0);
fopAcM_seStart(this, Z2SE_OBJ_ELEVATOR_START, 0);
}
}

2
src/d/actor/d_a_obj_onsenFire.cpp
View File

@ -21,7 +21,7 @@ int daObjOnsenFire_c::execute() {
dComIfGp_particle_setSimple(0x100,&current.pos,0xff,g_whiteColor,g_whiteColor,0,0.0f);
dComIfGp_particle_setSimple(0x101,&current.pos,0xff,g_whiteColor,g_whiteColor,0,0.0f);
dComIfGp_particle_setSimple(0x103,&current.pos,0xff,g_whiteColor,g_whiteColor,0,0.0f);
Z2AudioMgr::getInterface()->seStartLevel(Z2SE_OBJ_ONSEN_WARM_FIRE,&current.pos,0,0,1.0f,1.0f,-1.0f,-1.0f,0);
Z2GetAudioMgr()->seStartLevel(Z2SE_OBJ_ONSEN_WARM_FIRE,&current.pos,0,0,1.0f,1.0f,-1.0f,-1.0f,0);
return 1;
}

4
src/d/d_menu_option.cpp
View File

@ -899,7 +899,7 @@ void dMenu_Option_c::sound_move() {
-1.0f, 0);
break;
}
Z2AudioMgr::mAudioMgrPtr->setOutputMode(dMo_soundMode[field_0x3e9]);
mDoAud_setOutputMode(dMo_soundMode[field_0x3e9]);
setSoundMode(dMo_soundMode[field_0x3e9]);
field_0x3ef = SelectType3;
field_0x3f5 = SelectType2;
@ -925,7 +925,7 @@ void dMenu_Option_c::sound_move() {
-1.0f, 0);
break;
}
Z2AudioMgr::mAudioMgrPtr->setOutputMode(dMo_soundMode[field_0x3e9]);
mDoAud_setOutputMode(dMo_soundMode[field_0x3e9]);
setSoundMode(dMo_soundMode[field_0x3e9]);
field_0x3ef = SelectType3;
field_0x3f5 = SelectType2;

16
src/d/d_save.cpp
View File

@ -981,10 +981,10 @@ void dSv_player_config_c::init() {
#if PLATFORM_GCN
if (OSGetSoundMode() == OS_SOUND_MODE_MONO) {
mSoundMode = OS_SOUND_MODE_MONO;
Z2AudioMgr::mAudioMgrPtr->setOutputMode(OS_SOUND_MODE_MONO);
mDoAud_setOutputMode(OS_SOUND_MODE_MONO);
} else {
mSoundMode = OS_SOUND_MODE_STEREO;
Z2AudioMgr::mAudioMgrPtr->setOutputMode(OS_SOUND_MODE_STEREO);
mDoAud_setOutputMode(OS_SOUND_MODE_STEREO);
}
#endif
@ -1798,13 +1798,13 @@ int dSv_info_c::card_to_memory(char* i_cardPtr, int i_dataNum) {
#if PLATFORM_GCN
if (OSGetSoundMode() == OS_SOUND_MODE_MONO) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setSound(OS_SOUND_MODE_MONO);
Z2AudioMgr::mAudioMgrPtr->setOutputMode(OS_SOUND_MODE_MONO);
} else if (g_dComIfG_gameInfo.info.getPlayer().getConfig().getSound() == 2) {
Z2AudioMgr::mAudioMgrPtr->setOutputMode(2);
dComIfGs_setOptSound(OS_SOUND_MODE_MONO);
mDoAud_setOutputMode(OS_SOUND_MODE_MONO);
} else if (dComIfGs_getOptSound() == 2) {
mDoAud_setOutputMode(2);
} else {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setSound(OS_SOUND_MODE_STEREO);
Z2AudioMgr::mAudioMgrPtr->setOutputMode(OS_SOUND_MODE_STEREO);
dComIfGs_setOptSound(OS_SOUND_MODE_STEREO);
mDoAud_setOutputMode(OS_SOUND_MODE_STEREO);
}
#endif