mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-15 04:02:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

some J3D/misc cleanup (#2628)

Browse Source 
* some j3d cleanup

* begin using uintptr_t

* j3dgraphbase cleanup

* j3dgraphanimator cleanup
This commit is contained in:
TakaRikka
2025-09-04 07:56:59 -07:00
committed by GitHub
parent ee8b843996
commit b45a089e15
290 changed files with 4221 additions and 3605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_L7low_dr.cpp
+1 -1
View File
@@ -143,7 +143,7 @@ int daL7lowDr_c::CreateHeap() {
}
J3DModel* model = mpModelMorf->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
return 1;
}
src/d/actor/d_a_alink.cpp
+3 -3
View File
@@ -3925,7 +3925,7 @@ J3DModel* daAlink_c::initModel(J3DModelData* i_modelData, u32 mdlFlags, u32 diff
if (texNo >= 0) {
ResTIMG* timg = tex->getResTIMG(texNo);
if (mpWarpTexData == (void*)((u32)timg + timg->imageOffset)) {
if (mpWarpTexData == (void*)((uintptr_t)timg + timg->imageOffset)) {
warpMaterial = true;
}
}
@@ -4002,7 +4002,7 @@ static int daAlink_Draw(daAlink_c* i_this);
/* 800A4068-800A4820 09E9A8 07B8+00 1/1 0/0 0/0 .text createHeap__9daAlink_cFv */
int daAlink_c::createHeap() {
ResTIMG* sp14 = (ResTIMG*)dComIfG_getObjectRes("Always", 0x5D);
mpWarpTexData = (void*)((u32)sp14 + sp14->imageOffset);
mpWarpTexData = (void*)((uintptr_t)sp14 + sp14->imageOffset);
if (*dStage_roomControl_c::getDemoArcName() != 0) {
if (!initDemoModel(&mpDemoHLTmpModel, "demo00_Link_cut00_HL_tmp.bmd", 0x1000000)) {
@@ -14680,7 +14680,7 @@ void daAlink_c::setLight() {
spC4.z = light_m->field_0x18;
f32 var_f26;
if ((u32)light_m == (u32)&daAlinkHIO_wlLight_c0::m) {
if ((uintptr_t)light_m == (uintptr_t)&daAlinkHIO_wlLight_c0::m) {
cXyz spD0 = eyePos - field_0x34e0;
s16 sp104 = spD0.atan2sY_XZ();
s16 sp106 = spD0.atan2sX_Z();
src/d/actor/d_a_alink_bottle.inc
+1 -1
View File
@@ -94,7 +94,7 @@ void daAlink_c::setBottleModel(u16 i_itemNo) {
field_0x2f95 = 9;
} else {
item_model_data->getJointNodePointer(1)->setCallBack(daAlink_bottleModelCallBack);
mHeldItemModel->setUserArea((u32)this);
mHeldItemModel->setUserArea((uintptr_t)this);
field_0x2f94 = 3;
mItemMode = 0;
}
src/d/actor/d_a_alink_cut.inc
+3 -3
View File
@@ -777,14 +777,14 @@ void daAlink_c::initCutAtnActorSearch() {
mProcVar4.field_0x3010 = 0;
}
field_0x32cc = (u32)mTargetedActor;
field_0x32cc = (uintptr_t)mTargetedActor;
}
/* 800D2C54-800D2C78 0CD594 0024+00 3/3 0/0 0/0 .text checkCutAtnActorChange__9daAlink_cFv */
void daAlink_c::checkCutAtnActorChange() {
if (field_0x32cc != (u32)mTargetedActor) {
if (field_0x32cc != (uintptr_t)mTargetedActor) {
mProcVar4.field_0x3010 = 0;
field_0x32cc = (u32)mTargetedActor;
field_0x32cc = (uintptr_t)mTargetedActor;
}
}
src/d/actor/d_a_alink_effect.inc
+3 -3
View File
@@ -1796,13 +1796,13 @@ void daAlink_c::setFirePointDamageEffect() {
} else {
if (var_r26 && temp_r28 != NULL) {
temp_r28->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
temp_r28->setUserWork((u32)&var_r30->field_0x24);
temp_r28->setUserWork((uintptr_t)&var_r30->field_0x24);
}
JPABaseEmitter* temp_r28_2 = setEmitter(&var_r30->field_0x8, 0x743, &sp24, NULL);
if (var_r26 && temp_r28_2 != NULL) {
temp_r28_2->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
temp_r28_2->setUserWork((u32)&var_r30->field_0x24);
temp_r28_2->setUserWork((uintptr_t)&var_r30->field_0x24);
}
var_r30->field_0xc = sp24;
@@ -2019,7 +2019,7 @@ void daAlink_blur_c::draw() {
GXSetNumIndStages(0);
nColor0.a = field_0x20;
GXInitTexObj(&texObj, (void*)((u32)m_blurTex + m_blurTex->imageOffset), 0x10, 4, GX_TF_I4,
GXInitTexObj(&texObj, (void*)((uintptr_t)m_blurTex + m_blurTex->imageOffset), 0x10, 4, GX_TF_I4,
GX_CLAMP, GX_CLAMP, GX_FALSE);
GXInitTexObjLOD(&texObj, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE,
GX_ANISO_1);
src/d/actor/d_a_alink_hook.inc
+1 -1
View File
@@ -430,7 +430,7 @@ void daAlink_c::setHookshotModel() {
mDoExt_setCurrentHeap(heap);
resetHookshotMode();
mpHookChain->setUserArea((u32)this);
mpHookChain->setUserArea((uintptr_t)this);
field_0x2f94 = 1;
if (mEquipItem == fpcNm_ITEM_W_HOOKSHOT) {
field_0x2f95 = 6;
src/d/actor/d_a_alink_ironball.inc
+1 -1
View File
@@ -127,7 +127,7 @@ void daAlink_c::setIronBallModel() {
mDoExt_setCurrentHeap(prev_heap);
mpHookChain->setUserArea((u32)this);
mpHookChain->setUserArea((uintptr_t)this);
field_0xFB8.SetAtType(AT_TYPE_IRON_BALL);
field_0xFB8.SetAtHitMark(3);
src/d/actor/d_a_alink_wolf.inc
+4 -4
View File
@@ -150,7 +150,7 @@ void daAlink_c::changeWolf() {
mDoExt_setCurrentHeap(current_heap);
dComIfGs_setTransformStatus(1);
mpLinkModel->setUserArea((u32)this);
mpLinkModel->setUserArea((uintptr_t)this);
changeModelDataDirectWolf(0);
mEyeHL1.entry(field_0x064C, "wl_eye_Hilight");
mEyeHL2.entry(mpWlMidnaModel->getModelData(), "midona_eye_Hlight");
@@ -326,8 +326,8 @@ void daAlink_c::changeLink(int param_0) {
mDoExt_setCurrentHeap(current_heap);
dComIfGs_setTransformStatus(0);
mpLinkModel->setUserArea((u32)this);
mpLinkHatModel->setUserArea((u32)this);
mpLinkModel->setUserArea((uintptr_t)this);
mpLinkHatModel->setUserArea((uintptr_t)this);
changeModelDataDirect(param_0);
field_0x06e4 = NULL;
@@ -407,7 +407,7 @@ void daAlink_c::changeLink(int param_0) {
face_modeldata->getMaterialNodePointer(3)->setMaterialAnm(field_0x2180[1]);
mEyeHL1.entry(face_modeldata, "highlight02");
mpKanteraModel->setUserArea((u32)this);
mpKanteraModel->setUserArea((uintptr_t)this);
mpKanteraModel->getModelData()->getJointNodePointer(1)->setCallBack(
daAlink_kandelaarModelCallBack);
mZ2Link.setLinkState(var_r27);
src/d/actor/d_a_arrow.cpp
+1 -1
View File
@@ -536,7 +536,7 @@ int daArrow_c::procWait() {
JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(field_0x964);
if (emitter != NULL) {
emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
emitter->setUserWork((u32)&mSmokePos);
emitter->setUserWork((uintptr_t)&mSmokePos);
if (field_0x942 != 0) {
emitter->stopDrawParticle();
src/d/actor/d_a_b_bq.cpp
+1 -1
View File
@@ -2431,7 +2431,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
J3DModel* model = a_this->mpMorf->getModel();
model->setUserArea((u32)a_this);
model->setUserArea((uintptr_t)a_this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
src/d/actor/d_a_b_dr.cpp
+1 -1
View File
@@ -4084,7 +4084,7 @@ int daB_DR_c::CreateHeap() {
}
this->model = mpModelMorf->getModel();
this->model->setUserArea((u32)this);
this->model->setUserArea((uintptr_t)this);
for (u16 i = 0; i < this->model->getModelData()->getJointNum(); i++) {
if (i != 0) {
src/d/actor/d_a_b_ds.cpp
+2 -2
View File
@@ -4280,7 +4280,7 @@ void daB_DS_c::executeBullet() {
if (emitter != NULL) {
emitter->setGlobalTranslation(JGeometry::TVec3<f32>(current.pos));
emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
emitter->setUserWork((u32)&field_0x724);
emitter->setUserWork((uintptr_t)&field_0x724);
}
}
}
@@ -5401,7 +5401,7 @@ int daB_DS_c::CreateHeap() {
}
model = mpMorf->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
if (i != 0) {
model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
src/d/actor/d_a_b_gg.cpp
+2 -2
View File
@@ -4510,7 +4510,7 @@ int daB_GG_c::Create() {
fopAcM_setCullSizeFar(this, 3.0f);
J3DModel* model = mpModelMorf->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
if (i != 0) {
@@ -4521,7 +4521,7 @@ int daB_GG_c::Create() {
field_0x5ac = 150.0f;
if (mType == TYPE_L7_MBOSS) {
mpHelmetModel->setUserArea((u32)this);
mpHelmetModel->setUserArea((uintptr_t)this);
mpHelmetModel->getModelData()->getJointNodePointer(1)->setCallBack(HeadJointCallBack);
mpHelmetModel->getModelData()->getJointNodePointer(2)->setCallBack(HeadJointCallBack);
}
src/d/actor/d_a_b_gm.cpp
+1 -1
View File
@@ -2010,7 +2010,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
J3DModel* model = a_this->mpModelMorf->getModel();
model->setUserArea((u32)a_this);
model->setUserArea((uintptr_t)a_this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
src/d/actor/d_a_b_gnd.cpp
+2 -2
View File
@@ -4637,7 +4637,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
}
J3DModel* model = i_this->mpModelMorf->getModel();
model->setUserArea((u32)i_this);
model->setUserArea((uintptr_t)i_this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
@@ -4734,7 +4734,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
}
model = i_this->mpHorseMorf->getModel();
model->setUserArea((u32)a_this);
model->setUserArea((uintptr_t)a_this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
model->getModelData()->getJointNodePointer(i)->setCallBack(h_nodeCallBack);
}
src/d/actor/d_a_b_mgn.cpp
+1 -1
View File
@@ -3357,7 +3357,7 @@ int daB_MGN_c::CreateHeap() {
}
J3DModel* model = mpMgnModelMorf->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
if (i == 1 || i == 25) {
src/d/actor/d_a_b_ob.cpp
+6 -6
View File
@@ -3289,7 +3289,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
a_this->mBodyParts[i].mpMorf->getModel()->setUserArea((u32)i_this);
a_this->mBodyParts[i].mpMorf->getModel()->setUserArea((uintptr_t)i_this);
for (u16 j = 0; j < a_this->mBodyParts[i].mpMorf->getModel()->getModelData()->getJointNum();
j++)
@@ -3320,7 +3320,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
a_this->mBodyParts[i].mpFinMorf->getModel()->setUserArea((u32)i_this);
a_this->mBodyParts[i].mpFinMorf->getModel()->setUserArea((uintptr_t)i_this);
for (u16 j = 0;
j < a_this->mBodyParts[i].mpFinMorf->getModel()->getModelData()->getJointNum();
@@ -3351,7 +3351,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
a_this->mBodyParts[i].mpFinUnkMorf->getModel()->setUserArea((u32)i_this);
a_this->mBodyParts[i].mpFinUnkMorf->getModel()->setUserArea((uintptr_t)i_this);
for (u16 j = 0;
j < a_this->mBodyParts[i].mpFinUnkMorf->getModel()->getModelData()->getJointNum();
@@ -3376,7 +3376,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
a_this->mBodyParts[i].mpFinBMorf->getModel()->setUserArea((u32)i_this);
a_this->mBodyParts[i].mpFinBMorf->getModel()->setUserArea((uintptr_t)i_this);
for (u16 j = 0;
j < a_this->mBodyParts[i].mpFinBMorf->getModel()->getModelData()->getJointNum();
@@ -3401,7 +3401,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
a_this->mBodyParts[i].mpFinCMorf->getModel()->setUserArea((u32)i_this);
a_this->mBodyParts[i].mpFinCMorf->getModel()->setUserArea((uintptr_t)i_this);
for (u16 j = 0;
j < a_this->mBodyParts[i].mpFinCMorf->getModel()->getModelData()->getJointNum();
@@ -3424,7 +3424,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
a_this->mpSuiModel->setUserArea((u32)i_this);
a_this->mpSuiModel->setUserArea((uintptr_t)i_this);
for (u16 j = 0; j < modelData->getJointNum(); j++) {
modelData->getJointNodePointer(j)->setCallBack(sui_nodeCallBack);
src/d/actor/d_a_b_oh.cpp
+1 -1
View File
@@ -815,7 +815,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
this_->mpMorf->getModel()->setUserArea((u32)this_);
this_->mpMorf->getModel()->setUserArea((uintptr_t)this_);
for (u16 i = 0; i < this_->mpMorf->getModel()->getModelData()->getJointNum(); i++) {
this_->mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(
src/d/actor/d_a_b_oh2.cpp
+1 -1
View File
@@ -238,7 +238,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
_this->mpMorf->getModel()->setUserArea((u32)i_this);
_this->mpMorf->getModel()->setUserArea((uintptr_t)i_this);
for (u16 i = 0; i < _this->mpMorf->getModel()->getModelData()->getJointNum(); i++) {
_this->mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(
src/d/actor/d_a_b_tn.cpp
+1 -1
View File
@@ -5047,7 +5047,7 @@ int daB_TN_c::CreateHeap() {
}
J3DModel* model = mpModelMorf2->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
model->getModelData()->getJointNodePointer(5)->setCallBack(JointCallBack);
model->getModelData()->getJointNodePointer(1)->setCallBack(JointCallBack);
src/d/actor/d_a_b_zant.cpp
+1 -1
View File
@@ -5490,7 +5490,7 @@ int daB_ZANT_c::CreateHeap() {
}
J3DModel* model = mpModelMorf->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
model->getModelData()->getJointNodePointer(1)->setCallBack(JointCallBack);
model->getModelData()->getJointNodePointer(2)->setCallBack(JointCallBack);
src/d/actor/d_a_b_zant_magic.cpp
+1 -1
View File
@@ -83,7 +83,7 @@ void daB_ZANTM_c::setMagicEffect() {
if (emitter != NULL) {
emitter->setGlobalScale(size);
emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
emitter->setUserWork((u32)&field_0x5dc);
emitter->setUserWork((uintptr_t)&field_0x5dc);
}
}
}
src/d/actor/d_a_boomerang.cpp
+1 -1
View File
@@ -1520,7 +1520,7 @@ int daBoomerang_c::create() {
m_windBtk->searchUpdateMaterialID(mp_shippuModel->getModelData());
mp_shippuModel->getModelData()->entryTexMtxAnimator(m_windBtk);
mp_shippuModel->getModelData()->getJointNodePointer(4)->setCallBack(daBoomeang_windModelCallBack);
mp_shippuModel->setUserArea((u32)this);
mp_shippuModel->setUserArea((uintptr_t)this);
m_waitEffBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(daAlink_c::getAlinkArcName(), 0x47);
JUT_ASSERT(3011, m_waitEffBtk);
src/d/actor/d_a_coach_fire.cpp
+1 -1
View File
@@ -87,7 +87,7 @@ int daCoachFire_c::draw() {
speed.y = 0.0f;
speed *= 0.9f;
emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
emitter->setUserWork((u32)(&speed));
emitter->setUserWork((uintptr_t)(&speed));
}
return 1;
}
src/d/actor/d_a_cow.cpp
+1 -1
View File
@@ -3074,7 +3074,7 @@ int daCow_c::CreateHeap() {
return cPhs_INIT_e;
}
mpMorf->getModel()->setUserArea((u32)this);
mpMorf->getModel()->setUserArea((uintptr_t)this);
for (u16 iJoint = 0; iJoint < modelData->getJointNum(); iJoint++) {
if (iJoint == 1 || iJoint == 8 || iJoint == 0) {
src/d/actor/d_a_cstatue.cpp
+1 -1
View File
@@ -165,7 +165,7 @@ int daCstatue_c::createHeap() {
mpMorf = new mDoExt_McaMorfSO(
static_cast<J3DModelData*>(dComIfG_getObjectRes(mResName, (u16)resource_index)), NULL, NULL,
animation, 0, 0.0f, animation->getFrameMax(), -1, &mSound,
mType == daCstatueType_Normal2 ? J3DMdlFlag_None : J3DMdlFlag_Unk80000, data->morfIndex);
mType == daCstatueType_Normal2 ? J3DMdlFlag_None : J3DMdlFlag_DifferedDLBuffer, data->morfIndex);
if (mpMorf == NULL || mpMorf->mpModel == NULL) {
return cPhs_INIT_e;
src/d/actor/d_a_do.cpp
+1 -1
View File
@@ -2418,7 +2418,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
J3DModel* model = _this->mpMorf->getModel();
_this->model = model;
model->setUserArea((u32)i_this);
model->setUserArea((uintptr_t)i_this);
for (u16 jnt_no = 0; jnt_no < model->getModelData()->getJointNum(); jnt_no++) {
if (jnt_no == 9 || jnt_no == 10 || jnt_no == 22 || jnt_no == 23) {
src/d/actor/d_a_door_dbdoor00.cpp
+2 -2
View File
@@ -101,7 +101,7 @@ int daDbDoor00_c::CreateHeap() {
J3DJoint* nodePointerR = modelData->getJointNodePointer(field_0x5c1);
nodePointerL->setCallBack(nodeCallBack);
nodePointerR->setCallBack(nodeCallBack);
mpModel2->setUserArea((u32)this);
mpModel2->setUserArea((uintptr_t)this);
mpBgW = new dBgW();
cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb());
@@ -188,7 +188,7 @@ int daDbDoor00_c::getDemoAction() {
"WAIT", "SET_START", "SET_ANGLE", "END", "OPEN",
"STOP_OPEN", "SET_GOAL", "SET_GOAL2", "ADJUSTMENT",
};
return dComIfGp_evmng_getMyActIdx(field_0x598, action_table, ARRAY_SIZE(action_table), 0, 0);
return dComIfGp_evmng_getMyActIdx(field_0x598, action_table, ARRAY_SIZEU(action_table), 0, 0);
}
/* 8045DAB0-8045DE44 0007B0 0394+00 5/4 0/0 0/0 .text demoProc__12daDbDoor00_cFv */
src/d/actor/d_a_door_push.cpp
+1 -1
View File
@@ -260,7 +260,7 @@ int daDoorPush_c::demoProc() {
field_0x644 = dComIfGp_evmng_getMyStaffId("pdoor", NULL, 0);
s32 actIdx =
dComIfGp_evmng_getMyActIdx(field_0x644, action_table, ARRAY_SIZE(action_table), 0, 0);
dComIfGp_evmng_getMyActIdx(field_0x644, action_table, ARRAY_SIZEU(action_table), 0, 0);
if (dComIfGp_evmng_getIsAddvance(field_0x644) != 0) {
switch (actIdx) {
case WAIT_e:
src/d/actor/d_a_e_arrow.cpp
+1 -1
View File
@@ -89,7 +89,7 @@ static void fire_eff_set(e_arrow_class* i_this) {
if (emitter_p != NULL) {
if (i_this->field_0x5d8.abs() > 1.0f) {
emitter_p->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
emitter_p->setUserWork((u32)&i_this->field_0x5d8);
emitter_p->setUserWork((uintptr_t)&i_this->field_0x5d8);
} else {
emitter_p->setParticleCallBackPtr(NULL);
}
src/d/actor/d_a_e_ba.cpp
+2 -2
View File
@@ -962,7 +962,7 @@ static int daE_BA_Execute(e_ba_class* i_this) {
if (emitter != NULL) {
emitter->setGlobalSRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(18));
emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
emitter->setUserWork((u32)&i_this->field_0x6b0);
emitter->setUserWork((uintptr_t)&i_this->field_0x6b0);
}
}
i_this->mCreatureSound.startCreatureSoundLevel(Z2SE_EN_BA_FIRE, 0, -1);
@@ -977,7 +977,7 @@ static int daE_BA_Execute(e_ba_class* i_this) {
if (emitter != NULL) {
emitter->setGlobalSRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(18));
emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
emitter->setUserWork((u32)&i_this->field_0x6b0);
emitter->setUserWork((uintptr_t)&i_this->field_0x6b0);
}
}
}
src/d/actor/d_a_e_bg.cpp
+2 -2
View File
@@ -1198,7 +1198,7 @@ void daE_BG_c::mtx_set() {
J3DModel* model = mpMorfSO->getModel();
model->setBaseTRMtx(mDoMtx_stack_c::get());
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
@@ -1346,7 +1346,7 @@ int daE_BG_c::CreateHeap() {
J3DModel* model = mpMorfSO->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
src/d/actor/d_a_e_bs.cpp
+1 -1
View File
@@ -826,7 +826,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
J3DModel* model = a_this->modelMorf->getModel();
model->setUserArea((u32)a_this);
model->setUserArea((uintptr_t)a_this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
if (i == 10) {
src/d/actor/d_a_e_bu.cpp
+3 -3
View File
@@ -985,7 +985,7 @@ static int daE_BU_Execute(e_bu_class* i_this) {
if (emitter != NULL) {
emitter->setGlobalSRTMatrix(i_this->modelMorf->getModel()->getAnmMtx(0));
emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
emitter->setUserWork((u32)&i_this->field_0x6c0);
emitter->setUserWork((uintptr_t)&i_this->field_0x6c0);
}
}
} else {
@@ -997,7 +997,7 @@ static int daE_BU_Execute(e_bu_class* i_this) {
if (emitter != NULL) {
emitter->setGlobalSRTMatrix(i_this->modelMorf->getModel()->getAnmMtx(0));
emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
emitter->setUserWork((u32)&i_this->field_0x6c0);
emitter->setUserWork((uintptr_t)&i_this->field_0x6c0);
}
}
}
@@ -1039,7 +1039,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
J3DModel* model = a_this->modelMorf->getModel();
model->setUserArea((u32)a_this);
model->setUserArea((uintptr_t)a_this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
src/d/actor/d_a_e_cr.cpp
+1 -1
View File
@@ -486,7 +486,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
J3DModel* model = a_this->modelMorf->getModel();
model->setUserArea((u32)a_this);
model->setUserArea((uintptr_t)a_this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
if (i == 2) {
src/d/actor/d_a_e_dd.cpp
+1 -1
View File
@@ -1610,7 +1610,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
}
J3DModel* model = i_this->mpModelMorf->getModel();
model->setUserArea((u32)i_this);
model->setUserArea((uintptr_t)i_this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
if (i != 0) {
model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
src/d/actor/d_a_e_df.cpp
+1 -1
View File
@@ -725,7 +725,7 @@ int daE_DF_c::Create() {
initCcCylinder();
J3DModel* model = mpMorfSO->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
if (i != 0) {
src/d/actor/d_a_e_dn.cpp
+1 -1
View File
@@ -3289,7 +3289,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
}
J3DModel* model = i_this->mpModelMorf->getModel();
model->setUserArea((u32)i_this);
model->setUserArea((uintptr_t)i_this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
if (i != 0) {
src/d/actor/d_a_e_dt.cpp
+2 -2
View File
@@ -2502,7 +2502,7 @@ int daE_DT_c::CreateHeap() {
return 0;
}
J3DModel* model = mpMorf->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
}
@@ -2518,7 +2518,7 @@ int daE_DT_c::CreateHeap() {
if (mpSpitModel == NULL) {
return 0;
}
mpSpitModel->setUserArea((u32)this);
mpSpitModel->setUserArea((uintptr_t)this);
for (u16 i = 1; i < mpSpitModel->getModelData()->getJointNum(); i++) {
mpSpitModel->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBackTuba);
}
src/d/actor/d_a_e_fk.cpp
+1 -1
View File
@@ -848,7 +848,7 @@ int daE_FK_c::Create() {
mSize = 0.0f;
J3DModel* model_p = mpModelMorf->getModel();
model_p->setUserArea((u32)this);
model_p->setUserArea((uintptr_t)this);
for (u16 i = 0; i < model_p->getModelData()->getJointNum(); i++) {
if (i != 0) {
src/d/actor/d_a_e_fm.cpp
+1 -1
View File
@@ -3531,7 +3531,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
J3DModel* fm_model = a_this->mpFmModelMorf->getModel();
fm_model->setUserArea((u32)a_this);
fm_model->setUserArea((uintptr_t)a_this);
for (u16 i = 0; i < fm_model->getModelData()->getJointNum(); i++) {
if (i == 1 || i == 2) {
src/d/actor/d_a_e_fz.cpp
+1 -1
View File
@@ -892,7 +892,7 @@ s32 daE_FZ_c::execute() {
mDoMtx_stack_c::transM(0.0f, 40.0f, 0.0f);
emitter->setGlobalSRTMatrix(mDoMtx_stack_c::get());
emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
emitter->setUserWork((u32)(&mUserWork));
emitter->setUserWork((uintptr_t)(&mUserWork));
}
}
src/d/actor/d_a_e_gi.cpp
+1 -1
View File
@@ -1033,7 +1033,7 @@ int daE_GI_c::CreateHeap() {
}
J3DModel* model = mpModelMorf->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
if (i == 3) {
src/d/actor/d_a_e_gob.cpp
+1 -1
View File
@@ -2281,7 +2281,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
J3DModel* model = a_this->mpModelMorf->getModel();
model->setUserArea((u32)a_this);
model->setUserArea((uintptr_t)a_this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
src/d/actor/d_a_e_hp.cpp
+2 -2
View File
@@ -1166,7 +1166,7 @@ int daE_HP_c::CreateHeap() {
}
model = mpMorfSO->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
if (i != 0) {
@@ -1182,7 +1182,7 @@ int daE_HP_c::CreateHeap() {
return 0;
}
mpModel->setUserArea((u32)this);
mpModel->setUserArea((uintptr_t)this);
for (u16 i = 0; i < mpModel->getModelData()->getJointNum(); i++) {
if (i != 0) {
mpModel->getModelData()->getJointNodePointer(i)->setCallBack(LampJointCallBack);
src/d/actor/d_a_e_hzelda.cpp
+1 -1
View File
@@ -1345,7 +1345,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
J3DModel* model = a_this->mpModelMorf->getModel();
model->setUserArea((u32)a_this);
model->setUserArea((uintptr_t)a_this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
src/d/actor/d_a_e_kk.cpp
+1 -1
View File
@@ -1371,7 +1371,7 @@ int daE_KK_c::CreateHeap() {
return 0;
}
model = mpMorfSO->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
if (i != 0) {
model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
src/d/actor/d_a_e_mf.cpp
+1 -1
View File
@@ -3160,7 +3160,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
}
J3DModel* model = i_this->mpModelMorf->getModel();
model->setUserArea((u32)i_this);
model->setUserArea((uintptr_t)i_this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
if (i != 0) {
src/d/actor/d_a_e_oc.cpp
+1 -1
View File
@@ -2487,7 +2487,7 @@ int daE_OC_c::CreateHeap() {
return 0;
}
J3DModel* my_model = mpMorf->getModel();
my_model->setUserArea((u32)this);
my_model->setUserArea((uintptr_t)this);
for (u16 idx = 1; idx < my_model->getModelData()->getJointNum(); ++idx) {
if (idx == 0x11 || idx == 0xc) {
my_model->getModelData()->getJointNodePointer(idx)->setCallBack(&daE_OC_c::JointCallBack);
src/d/actor/d_a_e_oct_bg.cpp
+1 -1
View File
@@ -816,7 +816,7 @@ int daE_OctBg_c::CreateHeap() {
return 0;
}
J3DModel* model = field_0x5b4->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
}
src/d/actor/d_a_e_ph.cpp
+1 -1
View File
@@ -1265,7 +1265,7 @@ int daE_PH_c::create() {
mAtInfo.mpSound = &mSound;
J3DModel* model = mpMorf->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
if (i != 0) {
src/d/actor/d_a_e_pm.cpp
+1 -1
View File
@@ -2815,7 +2815,7 @@ cPhs__Step daE_PM_c::Create() {
mCreatureSound.setEnemyName("E_PM");
J3DModel* model = mpMorf->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
model->getModelData()->getJointNodePointer(JNT_HEAD)->setCallBack(JointCallBack);
if (dComIfG_play_c::getLayerNo(0) == 2 || dComIfG_play_c::getLayerNo(0) == 5) {
src/d/actor/d_a_e_po.cpp
+2 -2
View File
@@ -1096,7 +1096,7 @@ static void e_po_dead(e_po_class* i_this) {
JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->mParticleKey5[i]);
if (emitter != NULL) {
emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
emitter->setUserWork((u32)&i_this->field_0x814);
emitter->setUserWork((uintptr_t)&i_this->field_0x814);
}
}
bool var_r0 = FALSE;
@@ -2864,7 +2864,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
a_this->mpMorf->getModel()->setUserArea((u32)i_this);
a_this->mpMorf->getModel()->setUserArea((uintptr_t)i_this);
for (u16 i = 0; i < a_this->mpMorf->getModel()->getModelData()->getJointNum(); i++) {
if (i == 2 || (i >= 17 && i <= 22)) {
a_this->mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(
src/d/actor/d_a_e_rd.cpp
+4 -4
View File
@@ -5577,7 +5577,7 @@ static void fire_eff_set(e_rd_class* i_this) {
JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->field_0x1274[i]);
if (emitter != NULL) {
emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
emitter->setUserWork((u32)&i_this->field_0x1288);
emitter->setUserWork((uintptr_t)&i_this->field_0x1288);
}
}
}
@@ -7024,7 +7024,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
}
model = i_this->mpModelMorf->getModel();
model->setUserArea((u32)i_this);
model->setUserArea((uintptr_t)i_this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_B);
@@ -7085,7 +7085,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
}
model = i_this->mpModelMorf->getModel();
model->setUserArea((u32)i_this);
model->setUserArea((uintptr_t)i_this);
mDoMtx_stack_c::scaleS(0.0f, 0.0f, 0.0f);
model->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -7117,7 +7117,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
}
model = i_this->mpMorfBowAnm->getModel();
model->setUserArea((u32)i_this);
model->setUserArea((uintptr_t)i_this);
model->setBaseTRMtx(mDoMtx_stack_c::get());
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
src/d/actor/d_a_e_rdb.cpp
+1 -1
View File
@@ -1794,7 +1794,7 @@ static int useHeapInit(fopAc_ac_c* actor) {
}
J3DModel* model = i_this->mpModelMorf->getModel();
model->setUserArea((u32)i_this);
model->setUserArea((uintptr_t)i_this);
for (u16 i_idx = 0; i_idx < model->getModelData()->getJointNum(); i_idx++) {
model->getModelData()->getJointNodePointer(i_idx)->setCallBack(nodeCallBack);
}
src/d/actor/d_a_e_rdy.cpp
+3 -3
View File
@@ -3759,7 +3759,7 @@ static void fire_eff_set(e_rdy_class* i_this) {
JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->mFireParticleKey[i]);
if (emitter != NULL) {
emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
emitter->setUserWork((u32)&i_this->field_0x1358);
emitter->setUserWork((uintptr_t)&i_this->field_0x1358);
}
}
}
@@ -4809,7 +4809,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
J3DModel* model = _this->mpMorf->getModel();
model->setUserArea((u32)_this);
model->setUserArea((uintptr_t)_this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
}
@@ -4833,7 +4833,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
J3DModel* bow_model = _this->mpBowMorf->getModel();
bow_model->setUserArea((u32)_this);
bow_model->setUserArea((uintptr_t)_this);
for (u16 i = 0; i < bow_model->getModelData()->getJointNum(); i++) {
if (i == 2 || i == 3) {
bow_model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_bow);
src/d/actor/d_a_e_sb.cpp
+1 -1
View File
@@ -1196,7 +1196,7 @@ cPhs__Step daE_SB_c::Create() {
mCyl.OffAtSetBit();
mSound.setEnemyName("E_SB");
J3DModel* model = mpMorf->getModel();
model->setUserArea((u32) this);
model->setUserArea((uintptr_t) this);
for (u16 idx = 0; idx < model->getModelData()->getJointNum(); ++idx) {
if (idx != 0) {
model->getModelData()->getJointNodePointer(idx)->setCallBack(JointCallBack);
src/d/actor/d_a_e_sg.cpp
+1 -1
View File
@@ -1176,7 +1176,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
a_this->mpModel->setUserArea((u32)i_this);
a_this->mpModel->setUserArea((uintptr_t)i_this);
if (a_this->mJoint.init(a_this, &jc_data, a_this->mpModel, 1) == 0) {
return 0;
}
src/d/actor/d_a_e_sm2.cpp
+1 -1
View File
@@ -1430,7 +1430,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
a_this->modelMorf->getModel()->setUserArea((u32)a_this);
a_this->modelMorf->getModel()->setUserArea((uintptr_t)a_this);
for (u16 i = 0; i < a_this->modelMorf->getModel()->getModelData()->getJointNum(); i++) {
if (i >= 1) {
src/d/actor/d_a_e_th.cpp
+1 -1
View File
@@ -1209,7 +1209,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
}
J3DModel* model_p = i_this->mpModelMorf->getModel();
model_p->setUserArea((u32)i_this);
model_p->setUserArea((uintptr_t)i_this);
for (u16 i = 0; i < model_p->getModelData()->getJointNum(); i++) {
model_p->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
src/d/actor/d_a_e_tk_ball.cpp
+1 -1
View File
@@ -285,7 +285,7 @@ static void action(e_tk_ball_class* i_this) {
particle_emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
i_this->mParticleDirection = particle_position - i_this->mPreviousPosition;
i_this->mParticleDirection *= 0.8f;
particle_emitter->setUserWork((u32)&i_this->mParticleDirection);
particle_emitter->setUserWork((uintptr_t)&i_this->mParticleDirection);
i_this->mPreviousPosition = particle_position;
break;
}
src/d/actor/d_a_e_vt.cpp
+2 -2
View File
@@ -3747,7 +3747,7 @@ int daE_VA_c::CreateHeap() {
}
J3DModel* model = mpMorf->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
if (i == 11 || i == 12 || i == 13 || i == 14 || i == 27 || i == 33 || i == 34) {
@@ -3786,7 +3786,7 @@ int daE_VA_c::CreateHeap() {
}
model = mpEndEfMorf->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
if (i == 11 || i == 12 || i == 13 || i == 14 || i == 27 || i == 33 || i == 34) {
src/d/actor/d_a_e_wb.cpp
+1 -1
View File
@@ -2407,7 +2407,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
}
J3DModel* model = i_this->mpModelMorf->getModel();
model->setUserArea((u32)i_this);
model->setUserArea((uintptr_t)i_this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
src/d/actor/d_a_e_ym.cpp
+1 -1
View File
@@ -293,7 +293,7 @@ void daE_YM_c::setFireEffect() {
if (emitter != NULL) {
if (speed.abs() > 1.0f) {
emitter->setParticleCallBackPtr((JPAParticleCallBack*)&JPTracePCB4);
emitter->setUserWork((u32)field_0x6d0);
emitter->setUserWork((uintptr_t)field_0x6d0);
} else {
emitter->setParticleCallBackPtr(NULL);
}
src/d/actor/d_a_e_ymb.cpp
+1 -1
View File
@@ -3201,7 +3201,7 @@ int daE_YMB_c::CreateHeap() {
}
J3DModel* model = mpModelMorf->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
}
src/d/actor/d_a_horse.cpp
+1 -1
View File
@@ -747,7 +747,7 @@ int daHorse_c::create() {
procWaitInit();
m_model->setUserArea((u32)this);
m_model->setUserArea((uintptr_t)this);
for (u16 i = 0; i < 38; i++) {
m_modelData->getJointNodePointer(i)->setCallBack(daHorse_modelCallBack);
}
src/d/actor/d_a_hozelda.cpp
+1 -1
View File
@@ -225,7 +225,7 @@ int daHoZelda_c::create() {
J3DModelData* modelData = mpZeldaModel->getModelData();
modelData->getJointNodePointer(0)->setMtxCalc(field_0x5a8);
mpZeldaModel->setUserArea((u32)this);
mpZeldaModel->setUserArea((uintptr_t)this);
modelData->getJointNodePointer(0)->setCallBack(daHoZelda_modelCallBack);
modelData->getJointNodePointer(1)->setCallBack(daHoZelda_modelCallBack);
src/d/actor/d_a_kago.cpp
+1 -1
View File
@@ -3804,7 +3804,7 @@ int daKago_c::CreateHeap() {
}
J3DModel* model = mpMorf->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
if (i == 3 || i == 5 || i == 6) {
src/d/actor/d_a_mg_fshop.cpp
+1 -1
View File
@@ -239,7 +239,7 @@ static void koro2_draw(fshop_class* param_1) {
}
g_env_light.setLightTevColorType_MAJI(ArcIX_A_crwaku_model[0], &param_1->tevStr);
mDoExt_modelUpdateDL(ArcIX_A_crwaku_model[0]);
for (s32 iVar1 = 0; iVar1 < (s32)ARRAY_SIZE(param_1->mKoro2); iVar1++) {
for (s32 iVar1 = 0; iVar1 < ARRAY_SIZE(param_1->mKoro2); iVar1++) {
if (param_1->mKoro2[iVar1].mpModel != NULL) {
g_env_light.setLightTevColorType_MAJI(param_1->mKoro2[iVar1].mpModel, &param_1->tevStr);
mDoExt_modelUpdateDL(param_1->mKoro2[iVar1].mpModel);
src/d/actor/d_a_mg_rod.cpp
+4 -4
View File
@@ -230,7 +230,7 @@ static int dmg_rod_Draw(dmg_rod_class* i_this) {
g_env_light.setLightTevColorType_MAJI(i_this->esa_model[i_this->esa_kind - 1], &actor->tevStr);
if (i_this->esa_kind == 2) {
i_this->esa_model[i_this->esa_kind - 1]->setUserArea((u32)i_this);
i_this->esa_model[i_this->esa_kind - 1]->setUserArea((uintptr_t)i_this);
for (u16 i = 0; i < i_this->esa_model[i_this->esa_kind - 1]->getModelData()->getJointNum(); i++) {
if (i >= 1) {
i_this->esa_model[i_this->esa_kind - 1]->getModelData()->getJointNodePointer(i)->setCallBack(Worm_nodeCallBack);
@@ -6086,7 +6086,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
if (i == 0) {
a_this->lure_model[i]->setUserArea((u32)a_this);
a_this->lure_model[i]->setUserArea((uintptr_t)a_this);
for (u16 j = 0; j < a_this->lure_model[i]->getModelData()->getJointNum(); j++) {
if (j == 1) {
a_this->lure_model[i]->getModelData()->getJointNodePointer(j)->setCallBack(frog_nodeCallBack);
@@ -6094,7 +6094,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
} else {
if (i == 3) {
a_this->lure_model[i]->setUserArea((u32)a_this);
a_this->lure_model[i]->setUserArea((uintptr_t)a_this);
for (u16 j = 0; j < a_this->lure_model[i]->getModelData()->getJointNum(); j++) {
if (j == 1 || j == 2) {
a_this->lure_model[i]->getModelData()->getJointNodePointer(j)->setCallBack(ws_nodeCallBack);
@@ -6131,7 +6131,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
J3DModel* model = a_this->rod_modelMorf->getModel();
model->setUserArea((u32)a_this);
model->setUserArea((uintptr_t)a_this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
if (i == 1 || i == 3) {
model->getModelData()->getJointNodePointer(i)->setCallBack(Reel_CallBack);
src/d/actor/d_a_midna.cpp
+1 -1
View File
@@ -533,7 +533,7 @@ cPhs__Step daMidna_c::create() {
mSound.init(&current.pos, &eyePos, 3, 1);
mpShadowModel = mpMorf->getModel();
mpShadowModel->setUserArea((u32)this);
mpShadowModel->setUserArea((uintptr_t)this);
J3DModelData* model_data = mpShadowModel->getModelData();
model_data->getJointNodePointer(JNT_WORLD_ROOT)->setCallBack(&daMidna_modelCallBack);
src/d/actor/d_a_nbomb.cpp
+1 -1
View File
@@ -535,7 +535,7 @@ void daNbomb_c::setEffect() {
JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(mEffectEmitterIDs[0]);
if (emitter != NULL) {
emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
emitter->setUserWork((u32)&field_0xbe4);
emitter->setUserWork((uintptr_t)&field_0xbe4);
}
mEffectEmitterIDs[1] =
src/d/actor/d_a_ni.cpp
+1 -1
View File
@@ -2086,7 +2086,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
J3DModel* model = a_this->mpMorf->getModel();
a_this->model = model;
model->setUserArea((u32)a_this);
model->setUserArea((uintptr_t)a_this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
src/d/actor/d_a_npc.cpp
+3 -3
View File
@@ -715,7 +715,7 @@ static f32 dummy_literal() {
*/
void daNpcT_JntAnm_c::initialize() {
mActrMngr.initialize();
memset(&mAttnPos, 0, (u32)&field_0x158 - (u32)&mAttnPos);
memset(&mAttnPos, 0, (uintptr_t)&field_0x158 - (uintptr_t)&mAttnPos);
}
/* 80146CD8-80147858 141618 0B80+00 1/0 0/0 52/52 .text
@@ -1610,7 +1610,7 @@ void daNpcT_c::setMtx() {
mDoMtx_stack_c::scaleM(scale);
model->setBaseTRMtx(mDoMtx_stack_c::get());
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpMorf[0]->onMorfNone();
if (cM3d_IsZero(field_0xdfc) != FALSE) {
@@ -1986,7 +1986,7 @@ void daNpcT_c::evtChange() {
void daNpcT_c::clrParam() {
field_0xd7e = mCurAngle;
mCutType = 0;
memset(&mEvtNo, 0, (u32)&field_0xe38 - (u32)&mEvtNo);
memset(&mEvtNo, 0, (uintptr_t)&field_0xe38 - (uintptr_t)&mEvtNo);
mJntAnm.clrDirectFlag();
}
src/d/actor/d_a_npc2.cpp
+1 -1
View File
@@ -638,7 +638,7 @@ void daBaseNpc_c::setMtx(int param_0) {
model->setBaseTRMtx(mDoMtx_stack_c::get());
if (param_0) {
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
} else {
model->setUserArea(0);
}
src/d/actor/d_a_npc4.cpp
+2 -2
View File
@@ -740,7 +740,7 @@ void daNpcF_c::setMtx() {
mDoMtx_stack_c::ZXYrotM(mCurAngle);
mDoMtx_stack_c::scaleM(scale);
model->setBaseTRMtx(mDoMtx_stack_c::get());
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
if (mAnmFlags & 0x100) {
mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame());
@@ -757,7 +757,7 @@ void daNpcF_c::setMtx2() {
mDoMtx_stack_c::ZXYrotM(mCurAngle);
mDoMtx_stack_c::scaleM(scale);
model->setBaseTRMtx(mDoMtx_stack_c::get());
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
if (cM3d_IsZero_inverted(mExpressionMorf)) {
mpMorf->onMorfNone();
src/d/actor/d_a_npc_ash.cpp
+2 -2
View File
@@ -556,7 +556,7 @@ BOOL daNpcAsh_c::CreateHeap() {
for (u16 jointNo = 0; jointNo < modelData->getJointNum(); jointNo++) {
modelData->getJointNodePointer(jointNo)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpMatAnm = new daNpcF_MatAnm_c();
if (mpMatAnm == NULL) {
@@ -1201,7 +1201,7 @@ bool daNpcAsh_c::demo(void* param_0) {
if (staff_id != -1) {
mStaffID = staff_id;
s32 eventIdx = eventManager.getMyActIdx(staff_id, l_evtNames,
ARRAY_SIZE(l_evtNames), 0, 0);
ARRAY_SIZEU(l_evtNames), 0, 0);
if (eventIdx >= 1 && eventIdx < 6) {
mOrderEvtNo = eventIdx;
}
src/d/actor/d_a_npc_ashB.cpp
+1 -1
View File
@@ -419,7 +419,7 @@ BOOL daNpcAshB_c::CreateHeap() {
for (u16 jointNo = 0; jointNo < modelData->getJointNum(); jointNo++) {
modelData->getJointNodePointer(jointNo)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpMatAnm = new daNpcF_MatAnm_c();
if (mpMatAnm == NULL) {
src/d/actor/d_a_npc_besu.cpp
+1 -1
View File
@@ -715,7 +715,7 @@ int daNpc_Besu_c::CreateHeap() {
for (u16 i = 0; i < modelData->getJointNum(); i++) {
modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpMatAnm[0] = new daNpcT_MatAnm_c();
if (mpMatAnm[0] == NULL) {
return 0;
src/d/actor/d_a_npc_bou.cpp
+1 -1
View File
@@ -257,7 +257,7 @@ int daNpc_Bou_c::CreateHeap() {
modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpMatAnm[0] = new daNpcT_MatAnm_c();
if (mpMatAnm[0] == NULL) {
return 0;
src/d/actor/d_a_npc_cd.cpp
+1 -1
View File
@@ -260,7 +260,7 @@ int daNpcCd_c::NpcCreate(int param_1) {
a_mdlData_p->getJointNodePointer(i)->setCallBack(jntNodeCallBack);
}
mpMorf->getModel()->setUserArea((u32)this);
mpMorf->getModel()->setUserArea((uintptr_t)this);
OS_REPORT(" [ | X l Type=%d ", param_1);
src/d/actor/d_a_npc_cd2.cpp
+1 -1
View File
@@ -293,7 +293,7 @@ int daNpcCd2_c::NpcCreate(int param_1) {
for (u16 i = 0; i < a_mdlData_p->getJointNum(); i++) {
a_mdlData_p->getJointNodePointer(i)->setCallBack(jntNodeCallBack);
}
mpMorf->getModel()->setUserArea((u32)this);
mpMorf->getModel()->setUserArea((uintptr_t)this);
return 1;
}
src/d/actor/d_a_npc_coach.cpp
+5 -5
View File
@@ -566,7 +566,7 @@ int daNpcCoach_c::createHeap() {
for (u16 i = 0; i < modelData->getJointNum(); i++) {
modelData->getJointNodePointer(i)->setCallBack(jointHorseCallBack);
}
mChHorse.mpModelMorf->getModel()->setUserArea((u32)this);
mChHorse.mpModelMorf->getModel()->setUserArea((uintptr_t)this);
mChHorse.mpBtpAnm = new mDoExt_btpAnm();
J3DAnmTexPattern* i_btk = (J3DAnmTexPattern*)dComIfG_getObjectRes(l_arcName, BTP_HU_EYE);
@@ -607,7 +607,7 @@ int daNpcCoach_c::createHeap() {
modelData->getJointNodePointer(i)->setCallBack(jointFrontWheelCallBack);
}
}
mChHarness.mHarnessModel->setUserArea((u32)this);
mChHarness.mHarnessModel->setUserArea((uintptr_t)this);
mChHarness.field_0x6a0 = new dBgW();
if (mChHarness.field_0x6a0 == NULL) {
@@ -637,7 +637,7 @@ int daNpcCoach_c::createHeap() {
modelData->getJointNodePointer(i)->setCallBack(jointCoachCallBack);
}
}
mChCoach.mCoachModel->setUserArea((u32)this);
mChCoach.mCoachModel->setUserArea((uintptr_t)this);
mChCoach.field_0x564 = new dBgW();
if (mChCoach.field_0x564 == NULL) {
@@ -917,10 +917,10 @@ void daNpcCoach_c::setCoachBlazing(u8 param_1) {
mChCoach.field_0x5d4 = mChCoach.field_0x5c8 * 0.8f;
mChCoach.field_0x5f8[0]->setGlobalAlpha(param_1);
mChCoach.field_0x5f8[0]->setRate(fVar1);
mChCoach.field_0x5f8[0]->setUserWork((u32)&mChCoach.field_0x5d4);
mChCoach.field_0x5f8[0]->setUserWork((uintptr_t)&mChCoach.field_0x5d4);
mChCoach.field_0x5f8[1]->setGlobalAlpha(uVar2);
mChCoach.field_0x5f8[1]->setRate(fVar2);
mChCoach.field_0x5f8[1]->setUserWork((u32)&mChCoach.field_0x5d4);
mChCoach.field_0x5f8[1]->setUserWork((uintptr_t)&mChCoach.field_0x5d4);
}
/* 8099F4BC-8099F988 001E5C 04CC+00 1/1 0/0 0/0 .text reinsExecute__12daNpcCoach_cFv */
src/d/actor/d_a_npc_doorboy.cpp
+1 -1
View File
@@ -250,7 +250,7 @@ int daNpcDoorBoy_c::CreateHeap() {
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
mpMorf->getModel()->setUserArea((u32)this);
mpMorf->getModel()->setUserArea((uintptr_t)this);
setMotion(MOT_WAIT_A, -1.0f, 0);
src/d/actor/d_a_npc_grc.cpp
+1 -1
View File
@@ -387,7 +387,7 @@ int daNpc_grC_c::CreateHeap() {
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
field_0xbd8 = 0;
src/d/actor/d_a_npc_grmc.cpp
+1 -1
View File
@@ -294,7 +294,7 @@ int daNpc_grMC_c::CreateHeap() {
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpMatAnm[0] = NULL;
src/d/actor/d_a_npc_grr.cpp
+1 -1
View File
@@ -361,7 +361,7 @@ int daNpc_grR_c::CreateHeap() {
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpMatAnm = new daNpcF_MatAnm_c();
if (mpMatAnm == NULL) {
src/d/actor/d_a_npc_hanjo.cpp
+1 -1
View File
@@ -263,7 +263,7 @@ int daNpc_Hanjo_c::CreateHeap() {
for (u16 i = 0; i < modelData->getJointNum(); i++) {
modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpMatAnm[0] = new daNpcT_MatAnm_c();
if (mpMatAnm[0] == NULL) {
return 0;
src/d/actor/d_a_npc_impal.cpp
+1 -1
View File
@@ -187,7 +187,7 @@ BOOL daNpcImpal_c::CreateHeap() {
for (u16 jointNo = 0; jointNo < modelData->getJointNum(); jointNo++) {
modelData->getJointNodePointer(jointNo)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpMatAnm = new daNpcF_MatAnm_c();
if (mpMatAnm == NULL) {
src/d/actor/d_a_npc_jagar.cpp
+1 -1
View File
@@ -394,7 +394,7 @@ int daNpc_Jagar_c::CreateHeap() {
for (u16 i = 0; i < modelData->getJointNum(); i++) {
modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpMatAnm[0] = new daNpcT_MatAnm_c();
if (mpMatAnm[0] == NULL) {
src/d/actor/d_a_npc_kasi_hana.cpp
+1 -1
View File
@@ -724,7 +724,7 @@ int daNpcKasiHana_c::CreateHeap() {
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
setMotion(MOT_W_WAIT_A, -1.0f, 0);
src/d/actor/d_a_npc_kasi_kyu.cpp
+1 -1
View File
@@ -276,7 +276,7 @@ int daNpcKasiKyu_c::CreateHeap() {
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
setMotion(MOT_W_WAIT_A, -1.0f, 0);
src/d/actor/d_a_npc_kasi_mich.cpp
+1 -1
View File
@@ -276,7 +276,7 @@ int daNpcKasiMich_c::CreateHeap() {
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
setMotion(MOT_W_WAIT_A, -1.0f, 0);
src/d/actor/d_a_npc_kn.cpp
+3 -3
View File
@@ -525,7 +525,7 @@ int daNpc_Kn_c::CreateHeap() {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model_p->setUserArea((u32)this);
model_p->setUserArea((uintptr_t)this);
if (!mInvisModel.create(mpModelMorf[0]->getModel(), 1)) {
return 0;
@@ -557,7 +557,7 @@ int daNpc_Kn_c::CreateHeap() {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model_p->setUserArea((u32)this);
model_p->setUserArea((uintptr_t)this);
if (mType == 4) {
J3DModelData* modelData = NULL;
@@ -1075,7 +1075,7 @@ void daNpc_Kn_c::setAttnPos() {
mDoMtx_stack_c::ZXYrotM(mCurAngle);
mDoMtx_stack_c::scaleM(scale);
model->setBaseTRMtx(mDoMtx_stack_c::get());
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpModelMorf[1]->modelCalc();
mDoMtx_stack_c::copy(mpModelMorf[0]->getModel()->getAnmMtx(getHeadJointNo()));
src/d/actor/d_a_npc_kn_base.inc
+1 -1
View File
@@ -458,7 +458,7 @@ void daNpc_Kn_c::setMtx() {
mDoMtx_stack_c::ZXYrotM(mCurAngle);
mDoMtx_stack_c::scaleM(scale);
model_p->setBaseTRMtx(mDoMtx_stack_c::get());
model_p->setUserArea((u32)this);
model_p->setUserArea((uintptr_t)this);
if (mAnmFlags & ANM_PLAY_BCK) {
mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame());
src/d/actor/d_a_npc_kolin.cpp
+1 -1
View File
@@ -500,7 +500,7 @@ int daNpc_Kolin_c::CreateHeap() {
for (u16 i = 0; i < modelData->getJointNum(); i++) {
modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpMatAnm[0] = new daNpcT_MatAnm_c();
if (mpMatAnm[0] == NULL) {
src/d/actor/d_a_npc_kolinb.cpp
+1 -1
View File
@@ -353,7 +353,7 @@ int daNpc_Kolinb_c::CreateHeap() {
for (u16 i = 0; i < modelData->getJointNum(); i++) {
modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpBgW = new dBgW();
if (mpBgW == NULL) {
src/d/actor/d_a_npc_ks.cpp
+1 -1
View File
@@ -6892,7 +6892,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
}
J3DModel* model = i_this->mpModelMorf->getModel();
model->setUserArea((u32)i_this);
model->setUserArea((uintptr_t)i_this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
}
src/d/actor/d_a_npc_lf.cpp
+2 -2
View File
@@ -265,13 +265,13 @@ static int useHeapInit(fopAc_ac_c* i_this) {
lf_s* fish = a_this->mFish;
for (int i = 0; i < a_this->mIter; i++, fish++) {
fish->mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_Unk80000,0x11000084);
fish->mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer,0x11000084);
if (!fish->mpModel) {
return 0;
}
fish->mpModel->setUserArea((u32)fish);
fish->mpModel->setUserArea((uintptr_t)fish);
}
return 1;
src/d/actor/d_a_npc_maro.cpp
+1 -1
View File
@@ -318,7 +318,7 @@ int daNpc_Maro_c::CreateHeap() {
modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpMatAnm[0] = new daNpcT_MatAnm_c();
if (mpMatAnm[0] == NULL) {
return 0;

Some files were not shown because too many files have changed in this diff Show More