mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-29 16:44:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up mDoAud_seStart inline

Browse Source 
The devs apparently made 4 versions of this inline instead of just using default arguments.
This commit is contained in:
LagoLunatic
2025-03-17 15:57:18 -04:00
parent 9fd3443e35
commit 5cb5fe848b
5 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/m_Do/m_Do_audio.h
+13 -1
View File
@@ -127,10 +127,22 @@ inline void mDoAud_resetProcess() {
}
}
inline void mDoAud_seStart(u32 i_seNum, Vec* i_sePos = NULL, u32 param_2 = 0, s8 i_reverb = 0) {
inline void mDoAud_seStart(u32 i_seNum, Vec* i_sePos, u32 param_2, s8 i_reverb) {
mDoAud_zelAudio_c::getInterface()->seStart(i_seNum, i_sePos, param_2, i_reverb, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
inline void mDoAud_seStart(u32 i_seNum, Vec* i_sePos, u32 param_2) {
mDoAud_zelAudio_c::getInterface()->seStart(i_seNum, i_sePos, param_2, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
inline void mDoAud_seStart(u32 i_seNum, Vec* i_sePos) {
mDoAud_zelAudio_c::getInterface()->seStart(i_seNum, i_sePos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
inline void mDoAud_seStart(u32 i_seNum) {
mDoAud_zelAudio_c::getInterface()->seStart(i_seNum, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
inline void mDoAud_bgmSetSwordUsing(s32 param_1) {
mDoAud_zelAudio_c::getInterface()->bgmSetSwordUsing(param_1);
}
src/d/actor/d_a_kytag05.cpp
+2 -4
View File
@@ -5,13 +5,11 @@
#include "d/actor/d_a_kytag05.h"
#include "JAZelAudio/JAIZelBasic.h"
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_player_main.h"
#include "f_op/f_op_actor_mng.h"
#include "f_op/f_op_camera_mng.h"
#include "d/d_com_inf_game.h"
#include "d/d_kankyo_wether.h"
#include "d/actor/d_a_ykgr.h"
#include "f_op/f_op_camera.h"
#include "m_Do/m_Do_audio.h"
#include "d/d_procname.h"
@@ -104,7 +102,7 @@ static BOOL daKytag05_Execute(kytag05_class* a_this) {
dKyw_evt_wind_set(0, -0x32C8);
}
mDoAud_seStart(JA_SE_ATM_WIND_VAR, NULL, windPow * 100.0f, 0);
mDoAud_seStart(JA_SE_ATM_WIND_VAR, NULL, windPow * 100.0f);
return TRUE;
}
src/d/actor/d_a_npc_ji1.cpp
+1 -1
View File
@@ -734,7 +734,7 @@ BOOL daNpc_Ji1_c::kaitenAction(void*) {
if(l_msg) {
if(actionNo == 2) {
dComIfGp_getVibration().StartShock(5, -0x11, cXyz(0.0f, 1.0f, 0.0f));
mDoAud_seStart(JA_SE_CM_AJ_ANGRY_FOOT, 0, 0, 0);
mDoAud_seStart(JA_SE_CM_AJ_ANGRY_FOOT, NULL);
}
field_0xC78 += 1;
src/d/actor/d_a_player_tact.inc
+5 -5
View File
@@ -342,7 +342,7 @@ BOOL daPy_lk_c::procTactWait() {
if (m34D2 != 0) {
resetActAnimeUpper(UPPER_MOVE2_e, -1.0f);
resetActAnimeUpper(UPPER_MOVE1_e, -1.0f);
mDoAud_seStart(JA_SE_TAKT_USE_CANCEL, 0);
mDoAud_seStart(JA_SE_TAKT_USE_CANCEL);
}
g_dComIfG_gameInfo.play.field_0x4947 = 0;
@@ -464,7 +464,7 @@ BOOL daPy_lk_c::procTactWait() {
)
) {
m34D2 = 30;
mDoAud_seStart(JA_SE_WTAKT_MATCH_SIGNAL, 0);
mDoAud_seStart(JA_SE_WTAKT_MATCH_SIGNAL);
m35A0 = 0.0f;
} else {
m3574 = -1;
@@ -653,7 +653,7 @@ BOOL daPy_lk_c::procTactPlay() {
}
}
} else if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) {
mDoAud_seStart(JA_SE_TAKT_MATCHED, 0);
mDoAud_seStart(JA_SE_TAKT_MATCHED);
fopMsgM_messageSendOn();
m34D0 = 1;
@@ -688,7 +688,7 @@ BOOL daPy_lk_c::procTactPlayEnd_init(int r30) {
dCam_getBody()->EndEventCamera(fopAcM_GetID(this));
dComIfGp_event_setTalkPartner(dComIfGp_getCb1Player());
fopAcM_orderChangeEvent(this, dComIfGp_getCb1Player(), l_tact_event_label, 0, -1);
mDoAud_seStart(JA_SE_CTRL_LINK_TO_NPC, 0);
mDoAud_seStart(JA_SE_CTRL_LINK_TO_NPC);
} else if (r30 == 5) {
dCam_getBody()->EndEventCamera(fopAcM_GetID(this));
fopAcM_orderChangeEvent(this, l_tact_night_event_label, 0, -1);
@@ -803,7 +803,7 @@ BOOL daPy_lk_c::procTactPlayOriginal_init() {
/* 8014F690-8014F8A0 .text procTactPlayOriginal__9daPy_lk_cFv */
BOOL daPy_lk_c::procTactPlayOriginal() {
mDoAud_seStart(JA_SE_LK_WTAKT_USING, 0);
mDoAud_seStart(JA_SE_LK_WTAKT_USING);
if (m_old_fdata->getOldFrameRate() < 0.01f) {
if (m34D6 > 0) {
src/d/d_kankyo_rain.cpp
+1 -1
View File
@@ -2467,7 +2467,7 @@ void dKyr_thunder_move() {
cLib_addCalc(&pThunder->mFlashTimer, 1.0f, 0.3f, 0.2f, 0.001f);
if (pThunder->mFlashTimer >= 1.0f) {
if (pThunder->mState < 10)
mDoAud_seStart(JA_SE_OBJ_THUNDER_NEAR);
mDoAud_seStart(JA_SE_OBJ_THUNDER_NEAR, NULL);
pThunder->mState++;
}