mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-06 01:48:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Misc cleanup

Browse Source
This commit is contained in:
LagoLunatic
2025-08-11 19:47:08 -04:00
parent c249dfc155
commit 4a08af2148
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_ep.cpp
+1 -1
View File
@@ -108,7 +108,7 @@ BOOL ep_switch_event_move(ep_class* i_this) {
if (dComIfGp_evmng_getIsAddvance(i_this->m7E0)) {
static char* actions[] = { "WAIT", "FIRE" };
ret = dComIfGp_evmng_getMyActIdx(i_this->m7E0, actions, 2, FALSE, 0);
ret = dComIfGp_evmng_getMyActIdx(i_this->m7E0, actions, ARRAY_SIZE(actions), FALSE, 0);
switch (ret) {
case 1:
mDoAud_seStart(JA_SE_OBJ_TORCH_IGNITION, &i_this->mPosTop);
src/d/actor/d_a_mdoor.cpp
+1 -1
View File
@@ -202,7 +202,7 @@ void daMdoor_c::demoProc() {
"WAIT", "CLOSE", "STOP_OPEN",
};
s32 actIdx = dComIfGp_evmng_getMyActIdx(m2C0, action_table, 3, 0, 0);
s32 actIdx = dComIfGp_evmng_getMyActIdx(m2C0, action_table, ARRAY_SIZE(action_table), 0, 0);
if (dComIfGp_evmng_getIsAddvance(m2C0)) {
switch (actIdx) {
src/d/actor/d_a_player_fan.inc
+5 -5
View File
@@ -171,10 +171,10 @@ void daPy_lk_c::setParachuteFanModel(f32 f31) {
mpEquipItemModel = mpParachuteFanMorf->getModel();
mDoExt_setCurrentHeap(oldHeap);
mpEquipItemModel->setUserArea(reinterpret_cast<u32>(this));
modelData->getJointNodePointer(0x01)->setCallBack(daPy_parachuteJointCallback); // skeleton_root_Lroot joint
modelData->getJointNodePointer(0x07)->setCallBack(daPy_parachuteJointCallback); // skeleton_root_Rroot joint
modelData->getJointNodePointer(0x03)->setCallBack(daPy_parachuteJointCallback); // skeleton_root_LarmB joint
modelData->getJointNodePointer(0x09)->setCallBack(daPy_parachuteJointCallback); // skeleton_root_RarmB joint
modelData->getJointNodePointer(0x01)->setCallBack(daPy_parachuteJointCallback); // Lroot joint
modelData->getJointNodePointer(0x07)->setCallBack(daPy_parachuteJointCallback); // Rroot joint
modelData->getJointNodePointer(0x03)->setCallBack(daPy_parachuteJointCallback); // LarmB joint
modelData->getJointNodePointer(0x09)->setCallBack(daPy_parachuteJointCallback); // RarmB joint
}
/* 8014C254-8014C34C .text procFanSwing_init__9daPy_lk_cFv */
@@ -414,7 +414,7 @@ BOOL daPy_lk_c::procFanGlide() {
} else {
if (!dComIfGp_event_runCheck()) {
m3574--;
if (m3574 == 0 && (!(dComIfGs_getMagic() < 1))) {
if (m3574 == 0 && dComIfGs_getMagic() >= 1) {
dComIfGp_setItemMagicCount(-1);
m3574 = daPy_HIO_fan_c0::m.field_0x8;
}
src/d/actor/d_a_stone.cpp
+1 -2
View File
@@ -596,7 +596,6 @@ bool Act_c::damage_bg_proc() {
/* 000021F4-000023F4 .text damage_bg_proc_directly__Q27daStone5Act_cFv */
bool Act_c::damage_bg_proc_directly() {
fopAc_ac_c* a_this = (fopAc_ac_c*)this;
bool uVar7 = mAcch.ChkGroundHit();
bool iVar9 = false;
bool cVar4;
@@ -636,7 +635,7 @@ bool Act_c::damage_bg_proc_directly() {
} else if (uVar7) {
if (m678 == 0 && m674 == 0) {
if (!iVar9) {
fopAcM_seStart(a_this, data().m90, dComIfG_Bgsp()->GetMtrlSndId(mAcch.m_gnd));
fopAcM_seStart(this, data().m90, dComIfG_Bgsp()->GetMtrlSndId(mAcch.m_gnd));
eff_land_smoke();
}
m678 = 1;
src/d/d_camera.cpp
+1 -1
View File
@@ -4052,7 +4052,7 @@ bool dCamera_c::eventCamera(s32) {
m100 = 0;
m11C = 0;
}
lVar12 = dComIfGp_evmng_getMyActIdx(mEventData.mStaffIdx, ActionNames, 0x1C, 0, 0);
lVar12 = dComIfGp_evmng_getMyActIdx(mEventData.mStaffIdx, ActionNames, ARRAY_SIZE(ActionNames), 0, 0);
}
else {
mEventData.mStaffIdx = -1;