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

fopAcM_Register cleanup (#3047)

Browse Source 
* use macro `fopAcM_Register` more consistently

* replace fopAcM_RegisterCreateID with version that doesn't create `a_this`
This commit is contained in:
roeming
2026-01-17 08:52:32 -05:00
committed by GitHub
parent 7c71acb6b6
commit 0571b8c22d
101 changed files with 184 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_e_hp.cpp
+9 -9
View File
@@ -1132,14 +1132,14 @@ int daE_HP_c::_delete() {
}
static int daE_HP_Delete(daE_HP_c* i_this) {
fpc_ProcID id = fopAcM_GetID(i_this);
fopAcM_RegisterDeleteID(i_this, "E_HP");
return i_this->_delete();
}
int daE_HP_c::CreateHeap() {
J3DModelData* modeldata = (J3DModelData*)dComIfG_getObjectRes("E_HP", 19);
JUT_ASSERT(0x764, modeldata != NULL);
mpMorfSO = new mDoExt_McaMorfSO(modeldata, NULL, NULL,
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_HP", 19);
JUT_ASSERT(0x764, modelData != NULL);
mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_HP", 13), 2, 1.0f, 0,
-1, &mSound1, 0x80000, 0x11000084);
if (mpMorfSO == NULL || mpMorfSO->getModel() == NULL) {
@@ -1159,10 +1159,10 @@ int daE_HP_c::CreateHeap() {
}
}
modeldata = (J3DModelData*)dComIfG_getObjectRes("E_HP", 20);
JUT_ASSERT(0x78b, modeldata != NULL);
modelData = (J3DModelData*)dComIfG_getObjectRes("E_HP", 20);
JUT_ASSERT(0x78b, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modeldata, 0x80000, 0x11000084);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (mpModel == NULL) {
return 0;
}
@@ -1174,9 +1174,9 @@ int daE_HP_c::CreateHeap() {
}
}
modeldata = (J3DModelData*)dComIfG_getObjectRes("E_HP", 18);
modelData = (J3DModelData*)dComIfG_getObjectRes("E_HP", 18);
mpMorf =
new mDoExt_McaMorf(modeldata, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_HP", 4),
new mDoExt_McaMorf(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_HP", 4),
2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084);
if (mpMorf == NULL || mpMorf->getModel() == 0) {