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

Update all code to use the new enum formats

Browse Source
This commit is contained in:
LagoLunatic
2026-05-29 15:45:57 -04:00
parent 5ac87a6885
commit bae595b973
299 changed files with 5151 additions and 5134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_branch.cpp
+13 -12
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_branch.h"
#include "d/res/res_kwood_00.h"
#include "res/Object/Kwood_00.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_mtx.h"
@@ -13,9 +13,9 @@
#include "JSystem/J3DGraphBase/J3DMaterial.h"
static u16 anim_table[] = {
KWOOD_00_BCK_SWING02, KWOOD_00_BAS_SWING02,
KWOOD_00_BCK_SWING, KWOOD_00_BAS_SWING,
KWOOD_00_BCK_BREAK, KWOOD_00_BAS_BREAK,
dRes_ID_KWOOD_00_BCK_SWING02_e, dRes_ID_KWOOD_00_BAS_SWING02_e,
dRes_ID_KWOOD_00_BCK_SWING_e, dRes_ID_KWOOD_00_BAS_SWING_e,
dRes_ID_KWOOD_00_BCK_BREAK_e, dRes_ID_KWOOD_00_BAS_BREAK_e,
};
char daBranch_c::m_arcname[] = "Kwood_00";
@@ -39,12 +39,12 @@ void daBranch_c::set_mtx() {
}
/* 00000128-000001E4 .text set_anim__10daBranch_cFiii */
void daBranch_c::set_anim(int i_animIdx, int i_bckIdx, int i_basIdx) {
if (i_bckIdx > 0 && i_basIdx > 0) {
void daBranch_c::set_anim(int i_animIdx, int i_bckId, int i_basId) {
if (i_bckId > 0 && i_basId > 0) {
mAnims[i_animIdx]->setAnm(
static_cast<J3DAnmTransform*>(dComIfG_getObjectIDRes(m_arcname, i_bckIdx)),
static_cast<J3DAnmTransform*>(dComIfG_getObjectIDRes(m_arcname, i_bckId)),
-1, 0.0f, 1.0f, 0.0f, -1.0f,
dComIfG_getObjectIDRes(m_arcname, i_basIdx)
dComIfG_getObjectIDRes(m_arcname, i_basId)
);
}
}
@@ -55,7 +55,8 @@ void daBranch_c::demoPlay(mDoExt_McaMorf* morf) {
this,
dDemo_actor_c::ENABLE_ANM_e,
morf, m_arcname,
ARRAY_SIZE(anim_table) / 2, anim_table
ARRAY_SIZE(anim_table) / 2,
anim_table
);
}
@@ -67,9 +68,9 @@ BOOL daBranch_c::solidHeapCB(fopAc_ac_c* i_this) {
/* 00000248-0000049C .text CreateHeap__10daBranch_cFv */
BOOL daBranch_c::CreateHeap() {
int bmd[] = { KWOOD_00_BMD_WS, KWOOD_00_BMD_WB };
int bck[] = { KWOOD_00_BCK_SWING02, KWOOD_00_BCK_BREAK };
int bas[] = { KWOOD_00_BAS_SWING02, KWOOD_00_BAS_BREAK };
int bmd[] = { dRes_ID_KWOOD_00_BMD_WS_e, dRes_ID_KWOOD_00_BMD_WB_e };
int bck[] = { dRes_ID_KWOOD_00_BCK_SWING02_e, dRes_ID_KWOOD_00_BCK_BREAK_e };
int bas[] = { dRes_ID_KWOOD_00_BAS_SWING02_e, dRes_ID_KWOOD_00_BAS_BREAK_e };
BOOL status = TRUE;