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

Isolate JKRHeap operator overloads

Browse Source 
Fixes #25

This isolates the JKRHeap operator new/delete overloads. Every single new/delete site in the code has been replaced with a macro.

Sadly for new[] and delete[] we have to keep global operators. The global new[] just allocates into malloc() however, and delete[] goes into free() if it's not in a JKRHeap. So that's fine.
This commit is contained in:
PJB3005
2026-02-27 23:11:59 +01:00
parent 2204ad0813
commit 038ef4216f
634 changed files with 3451 additions and 3350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_L7demo_dr.cpp
+1 -1
View File
@@ -311,7 +311,7 @@ int daDr_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_dr", 0x49);
JUT_ASSERT(655, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_dr", 0x1E), 0, 0.0f, 0, -1, &mSound, 0, 0x11000084);
mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_dr", 0x1E), 0, 0.0f, 0, -1, &mSound, 0, 0x11000084);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
return 0;
}
src/d/actor/d_a_L7low_dr.cpp
+1 -1
View File
@@ -124,7 +124,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
int daL7lowDr_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L7lowDr", 10);
JUT_ASSERT(244, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("L7lowDr", 4), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("L7lowDr", 4), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
return 0;
}
src/d/actor/d_a_L7op_demo_dr.cpp
+1 -1
View File
@@ -756,7 +756,7 @@ static int daL7ODR_Delete(daL7ODR_c* i_this) {
int daL7ODR_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_dr", 0x49);
JUT_ASSERT(1146, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_dr", 0x2F), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084);
mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_dr", 0x2F), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084);
field_0x890 = 0x2F;
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
return 0;
src/d/actor/d_a_alink.cpp
+12 -12
View File
@@ -4128,7 +4128,7 @@ int daAlink_c::initDemoModel(J3DModel** i_ppmodel, char const* i_resName, u32 i_
int daAlink_c::initDemoBck(mDoExt_bckAnm** i_ppbck, char const* i_resName) {
J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(dStage_roomControl_c::getDemoArcName(), i_resName);
if (bck != NULL) {
*i_ppbck = new mDoExt_bckAnm();
*i_ppbck = JKR_NEW mDoExt_bckAnm();
if (*i_ppbck == NULL) {
return 0;
@@ -4193,7 +4193,7 @@ int daAlink_c::createHeap() {
return 0;
}
mpHIO = new daAlinkHIO_c();
mpHIO = JKR_NEW daAlinkHIO_c();
if (mpHIO == NULL) {
return 0;
}
@@ -4219,33 +4219,33 @@ int daAlink_c::createHeap() {
}
int sp38 = 40;
J3DTransformInfo* sp1C = new J3DTransformInfo[sp38];
J3DTransformInfo* sp1C = JKR_NEW J3DTransformInfo[sp38];
if (sp1C == NULL) {
return 0;
}
Quaternion* sp30 = new Quaternion[sp38];
Quaternion* sp30 = JKR_NEW Quaternion[sp38];
if (sp30 == NULL) {
return 0;
}
field_0x2060 = new mDoExt_MtxCalcOldFrame(sp1C, sp30);
field_0x2060 = JKR_NEW mDoExt_MtxCalcOldFrame(sp1C, sp30);
if (field_0x2060 == NULL) {
return 0;
}
field_0x1f20 = new mDoExt_MtxCalcAnmBlendTblOld(field_0x2060, 3, mNowAnmPackUnder);
field_0x1f20 = JKR_NEW mDoExt_MtxCalcAnmBlendTblOld(field_0x2060, 3, mNowAnmPackUnder);
if (field_0x1f20 == NULL) {
return 0;
}
field_0x1f24 = new mDoExt_MtxCalcAnmBlendTblOld(field_0x2060, 3, mNowAnmPackUpper);
field_0x1f24 = JKR_NEW mDoExt_MtxCalcAnmBlendTblOld(field_0x2060, 3, mNowAnmPackUpper);
if (field_0x1f24 == NULL) {
return 0;
}
for (int i = 0; i < 2; i++) {
field_0x2180[i] = new daAlink_matAnm_c();
field_0x2180[i] = JKR_NEW daAlink_matAnm_c();
if (field_0x2180[i] == NULL) {
return 0;
}
@@ -4256,7 +4256,7 @@ int daAlink_c::createHeap() {
return 0;
}
field_0x2d78 = new (0x20) u8[0x800];
field_0x2d78 = JKR_NEW_ARGS (0x20) u8[0x800];
if (field_0x2d78 == NULL) {
return 0;
}
@@ -4284,7 +4284,7 @@ int daAlink_c::createHeap() {
}
if (mpDemoFCBlendModel != NULL) {
field_0x069c = new mDoExt_blkAnm();
field_0x069c = JKR_NEW mDoExt_blkAnm();
if (field_0x069c == NULL) {
return 0;
}
@@ -14156,7 +14156,7 @@ BOOL daAlink_c::checkMagicArmorWearAbility() const {
J3DModelData* daAlink_c::loadAramBmd(u16 i_resIdx, u32 i_bufSize) {
JKRArchive* anmArchive = dComIfGp_getAnmArchive();
u8* tmpBuffer = new (0x20) u8[i_bufSize];
u8* tmpBuffer = JKR_NEW_ARGS (0x20) u8[i_bufSize];
JKRReadIdxResource(tmpBuffer, i_bufSize, i_resIdx, anmArchive);
#if DEBUG
@@ -14177,7 +14177,7 @@ J3DModelData* daAlink_c::loadAramBmd(u16 i_resIdx, u32 i_bufSize) {
}
void* daAlink_c::loadAram(u16 i_resIdx, u32 i_bufSize) {
u8* tmpBuffer = new (0x20) u8[i_bufSize];
u8* tmpBuffer = JKR_NEW_ARGS (0x20) u8[i_bufSize];
JKRReadIdxResource(tmpBuffer, i_bufSize, i_resIdx, dComIfGp_getAnmArchive());
#if DEBUG
daPy_aramBufferCheck(tmpBuffer, i_bufSize);
src/d/actor/d_a_alink_HIO.inc
+8 -8
View File
@@ -5172,8 +5172,8 @@ void daAlinkHIO_c::listenPropertyEvent(const JORPropertyEvent* event) {
}
case PROPERTY_SAVE_FILE_e: {
if (file.open(6, "すべてのファイル(*.*)\0*.*\0", NULL, NULL, NULL)) {
char* fileData = new (0x20) char[0x10000];
char* structData = new (0x20) char[0x10000];
char* fileData = JKR_NEW_ARGS (0x20) char[0x10000];
char* structData = JKR_NEW_ARGS (0x20) char[0x10000];
if (fileData != NULL && structData != NULL) {
size_t dataSize = makeFileOutData(fileData, structData);
@@ -5187,15 +5187,15 @@ void daAlinkHIO_c::listenPropertyEvent(const JORPropertyEvent* event) {
OS_REPORT("メモリ破壊が起こりました！！！！！\n");
}
delete[] fileData;
delete[] structData;
JKR_DELETE_ARRAY(fileData);
JKR_DELETE_ARRAY(structData);
} else {
if (fileData != NULL) {
delete[] fileData;
JKR_DELETE_ARRAY(fileData);
}
if (structData != NULL) {
delete[] structData;
JKR_DELETE_ARRAY(structData);
}
// Could not secure the write area
@@ -5210,12 +5210,12 @@ void daAlinkHIO_c::listenPropertyEvent(const JORPropertyEvent* event) {
}
case PROPERTY_LOAD_FILE_e: {
if (file.open(1, "すべてのファイル(*.*)\0*.*\0", NULL, NULL, NULL)) {
char* fileData = new (0x20) char[0x10000];
char* fileData = JKR_NEW_ARGS (0x20) char[0x10000];
if (fileData != NULL) {
file.readData(fileData, 0);
readFileData(fileData);
delete[] fileData;
JKR_DELETE_ARRAY(fileData);
} else {
// Could not secure the read area
OS_REPORT("読み込み用領域確保できませんでした\n");
src/d/actor/d_a_alink_effect.inc
+1 -1
View File
@@ -2075,7 +2075,7 @@ BOOL daAlink_lockCursor_c::create() {
field_0x4 = false;
field_0x30 = 0.0f;
mScrn = new J2DScreen();
mScrn = JKR_NEW J2DScreen();
if (mScrn == NULL) {
return false;
}
src/d/actor/d_a_alink_hook.inc
+3 -3
View File
@@ -396,10 +396,10 @@ void daAlink_c::setHookshotModel() {
field_0x0714 = initModel(mpHookTipModel->getModelData(), 0);
mpItemModelData = loadAramBmd(dRes_ID_ALANM_BMD_AL_HS_KUSARI_e, 0x1000);
mpHookChain = new hsChainShape_c();
mpHookSound = new Z2SoundObjSimple();
mpHookChain = JKR_NEW hsChainShape_c();
mpHookSound = JKR_NEW Z2SoundObjSimple();
mpHookshotLinChk = new dBgS_ObjLinChk();
mpHookshotLinChk = JKR_NEW dBgS_ObjLinChk();
mpHookshotLinChk->OffFullGrp();
mpHookshotLinChk->OnWaterGrp();
src/d/actor/d_a_alink_ironball.inc
+10 -10
View File
@@ -92,22 +92,22 @@ void daAlink_c::setIronBallModel() {
mHeldItemModel = initModelEnv(loadAramBmd(dRes_ID_ALANM_BMD_AL_IB_e, 0x2800), 0);
mpItemModelData = loadAramBmd(dRes_ID_ALANM_BMD_AL_HS_KUSARI_e, 0x1000);
mpHookChain = new hsChainShape_c();
mpHookChain = JKR_NEW hsChainShape_c();
mIronBallChainPos = new cXyz[102];
mIronBallChainAngle = new csXyz[102];
field_0x3848 = new cXyz[102];
mIronBallChainPos = JKR_NEW cXyz[102];
mIronBallChainAngle = JKR_NEW csXyz[102];
field_0x3848 = JKR_NEW cXyz[102];
field_0x0774 = new dBgS_AcchCir();
field_0x0778 = new dBgS_ObjAcch();
mpHookSound = new Z2SoundObjSimple();
field_0x0774 = JKR_NEW dBgS_AcchCir();
field_0x0778 = JKR_NEW dBgS_ObjAcch();
mpHookSound = JKR_NEW Z2SoundObjSimple();
mpHookshotLinChk = new dBgS_ObjLinChk();
mpHookshotLinChk = JKR_NEW dBgS_ObjLinChk();
mpHookshotLinChk->OffFullGrp();
mpHookshotLinChk->OnWaterGrp();
field_0x780 = new dBgS_ObjLinChk();
field_0x2f1c = new dPaPo_c();
field_0x780 = JKR_NEW dBgS_ObjLinChk();
field_0x2f1c = JKR_NEW dPaPo_c();
field_0x2f1c->init(field_0x0778, 32.0f, 64.0f);
mDoExt_setCurrentHeap(prev_heap);
src/d/actor/d_a_alink_swindow.inc
+4 -4
View File
@@ -239,7 +239,7 @@ void daAlink_c::changeModelDataDirectWolf(int param_0) {
void daAlink_c::initStatusWindow() {
onNoResetFlg2(FLG2_STATUS_WINDOW_DRAW);
void* tmpBuffer = new (0x20) void*[0x500];
void* tmpBuffer = JKR_NEW_ARGS (0x20) void*[0x500];
JUT_ASSERT(394, tmpBuffer);
u16 bckResIdx, btpResIdx, btkResIdx;
@@ -261,14 +261,14 @@ void daAlink_c::initStatusWindow() {
}
JKRReadIdxResource(tmpBuffer, 0x1400, bckResIdx, dComIfGp_getAnmArchive());
m_sWindowBck = new mDoExt_bckAnm();
m_sWindowBck = JKR_NEW mDoExt_bckAnm();
JUT_ASSERT(428, m_sWindowBck);
if (!m_sWindowBck->init((J3DAnmTransform*)J3DAnmLoaderDataBase::load(tmpBuffer), TRUE, 2, 1.0f, 0, -1, false)) {
JUT_ASSERT(433, FALSE);
}
tmpBuffer = new (0x20) void*[0x100];
tmpBuffer = JKR_NEW_ARGS (0x20) void*[0x100];
JUT_ASSERT(437, tmpBuffer);
JKRReadIdxResource(tmpBuffer, 0x400, btpResIdx, dComIfGp_getAnmArchive());
@@ -277,7 +277,7 @@ void daAlink_c::initStatusWindow() {
btp->searchUpdateMaterialID(field_0x06c0);
field_0x06c0->entryTexNoAnimator(btp);
tmpBuffer = new (0x20) void*[0x100];
tmpBuffer = JKR_NEW_ARGS (0x20) void*[0x100];
JUT_ASSERT(449, tmpBuffer);
JKRReadIdxResource(tmpBuffer, 0x400, btkResIdx, dComIfGp_getAnmArchive());
src/d/actor/d_a_alink_wolf.inc
+1 -1
View File
@@ -6807,7 +6807,7 @@ void daAlink_c::setWolfBallModel() {
field_0x0718 = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcName, 0x49));
field_0x0718->searchUpdateMaterialID(mHeldItemModel->getModelData());
mpHookSound = new Z2SoundObjSimple();
mpHookSound = JKR_NEW Z2SoundObjSimple();
mDoExt_setCurrentHeap(prev_heap);
mEquipItem = 0x10A;
src/d/actor/d_a_b_bh.cpp
+1 -1
View File
@@ -1427,7 +1427,7 @@ static int daB_BH_Delete(b_bh_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
b_bh_class* a_this = (b_bh_class*)i_this;
a_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_BH", BMDV_BH), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_BH", 12), 2, 1.0f, 0, -1, &a_this->mSound, 0, 0x11000084);
a_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_BH", BMDV_BH), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_BH", 12), 2, 1.0f, 0, -1, &a_this->mSound, 0, 0x11000084);
if (a_this->mpModelMorf == NULL || a_this->mpModelMorf->getModel() == NULL) {
return 0;
}
src/d/actor/d_a_b_bq.cpp
+3 -3
View File
@@ -2427,7 +2427,7 @@ static int daB_BQ_Delete(b_bq_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
b_bq_class* a_this = (b_bq_class*)i_this;
a_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_bq", BMDV_BQ), NULL,
a_this->mpMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_bq", BMDV_BQ), NULL,
NULL, NULL, J3DFrameCtrl::EMode_LOOP, 0.6f, 0, -1,
&a_this->mSound, 0, 0x11000284);
if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) {
@@ -2441,7 +2441,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
}
a_this->mpDeadBrk = new mDoExt_brkAnm();
a_this->mpDeadBrk = JKR_NEW mDoExt_brkAnm();
if (a_this->mpDeadBrk == NULL) {
return false;
}
@@ -2455,7 +2455,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
a_this->mpDeadBrk->setPlaySpeed(0.0f);
a_this->mpTodomeBtk = new mDoExt_btkAnm();
a_this->mpTodomeBtk = JKR_NEW mDoExt_btkAnm();
if (a_this->mpTodomeBtk == NULL) {
return false;
}
src/d/actor/d_a_b_dr.cpp
+2 -2
View File
@@ -3999,12 +3999,12 @@ int daB_DR_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_DR", 0x49);
JUT_ASSERT(6324, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_DR", 0x2F), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084);
mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_DR", 0x2F), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
return 0;
}
mpCoreBrk = new mDoExt_brkAnm();
mpCoreBrk = JKR_NEW mDoExt_brkAnm();
if (mpCoreBrk == NULL) {
return 0;
}
src/d/actor/d_a_b_dre.cpp
+3 -3
View File
@@ -21,18 +21,18 @@ int daB_DRE_c::CreateHeap() {
JUT_ASSERT(0xB4, modelData != NULL);
if (mAction == 0) {
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL,
mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("B_DR", 0x1D), 0,
1.0f, 0, -1, &mSound, 0, 0x11000084);
} else {
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL,
mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("B_DR", 0x1F), 2,
1.0f, 0, -1, &mSound, 0, 0x11000084);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
return 0;
}
mpCoreBrk = new mDoExt_brkAnm();
mpCoreBrk = JKR_NEW mDoExt_brkAnm();
if (mpCoreBrk == NULL) {
return 0;
}
src/d/actor/d_a_b_ds.cpp
+8 -8
View File
@@ -5308,7 +5308,7 @@ int daB_DS_c::CreateHeap() {
JUT_ASSERT(0, modelData != NULL);
mpMorf = new mDoExt_McaMorfSO(
mpMorf = JKR_NEW mDoExt_McaMorfSO(
modelData, NULL, NULL, static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", anm_res)),
0, 1.0f, 0, -1, &mSound, 0, 0x11000084);
if (mpMorf == NULL || mpMorf->getModel() == NULL) {
@@ -5326,14 +5326,14 @@ int daB_DS_c::CreateHeap() {
modelData = (J3DModelData*)dComIfG_getObjectRes("B_DS", 74);
JUT_ASSERT(0, modelData != NULL);
mpSwordMorf = new mDoExt_McaMorfSO(
mpSwordMorf = JKR_NEW mDoExt_McaMorfSO(
modelData, NULL, NULL, static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 63)), 0,
1.0f, 0, -1, NULL, 0, 0x11000084);
if (mpSwordMorf == NULL || mpSwordMorf->getModel() == NULL) {
return 0;
}
mpSwordBrkAnm = new mDoExt_brkAnm();
mpSwordBrkAnm = JKR_NEW mDoExt_brkAnm();
if (mpSwordBrkAnm == NULL) {
return 0;
}
@@ -5348,7 +5348,7 @@ int daB_DS_c::CreateHeap() {
modelData = (J3DModelData*)dComIfG_getObjectRes("B_DS", 75);
JUT_ASSERT(0, modelData != NULL);
mpZantMorf = new mDoExt_McaMorfSO(
mpZantMorf = JKR_NEW mDoExt_McaMorfSO(
modelData, NULL, NULL, static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 66)), 2,
1.0f, 0, -1, NULL, 0, 0x11000084);
if (mpZantMorf == NULL || mpZantMorf->getModel() == NULL) {
@@ -5363,7 +5363,7 @@ int daB_DS_c::CreateHeap() {
return 0;
}
mpOpPatternBrkAnm = new mDoExt_brkAnm();
mpOpPatternBrkAnm = JKR_NEW mDoExt_brkAnm();
if (mpOpPatternBrkAnm == NULL) {
return 0;
}
@@ -5375,7 +5375,7 @@ int daB_DS_c::CreateHeap() {
return 0;
}
mpOpPatternBtkAnm = new mDoExt_btkAnm();
mpOpPatternBtkAnm = JKR_NEW mDoExt_btkAnm();
if (mpOpPatternBtkAnm == NULL) {
return 0;
}
@@ -5395,7 +5395,7 @@ int daB_DS_c::CreateHeap() {
return 0;
}
mpPatternBrkAnm = new mDoExt_brkAnm();
mpPatternBrkAnm = JKR_NEW mDoExt_brkAnm();
if (mpPatternBrkAnm == NULL) {
return 0;
}
@@ -5407,7 +5407,7 @@ int daB_DS_c::CreateHeap() {
return 0;
}
mpPatternBtkAnm = new mDoExt_btkAnm();
mpPatternBtkAnm = JKR_NEW mDoExt_btkAnm();
if (mpPatternBtkAnm == NULL) {
return 0;
}
src/d/actor/d_a_b_gg.cpp
+1 -1
View File
@@ -154,7 +154,7 @@ int daB_GG_c::CreateHeap() {
modelData = (J3DModelData*)dComIfG_getObjectRes("B_gg", 0x23);
JUT_ASSERT(207, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gg", 0xE), 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gg", 0xE), 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
return 0;
}
src/d/actor/d_a_b_gm.cpp
+5 -5
View File
@@ -2013,7 +2013,7 @@ static int daB_GM_Delete(b_gm_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
b_gm_class* a_this = (b_gm_class*)i_this;
a_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_gm", 0x25), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gm", 30), 2, 0.6f, 0, -1, &a_this->mCreatureSound, 0, 0x11000284);
a_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_gm", 0x25), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gm", 30), 2, 0.6f, 0, -1, &a_this->mCreatureSound, 0, 0x11000284);
if (a_this->mpModelMorf == NULL || a_this->mpModelMorf->getModel() == NULL) {
return 0;
}
@@ -2025,7 +2025,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
}
a_this->mpZoomBtk = new mDoExt_btkAnm();
a_this->mpZoomBtk = JKR_NEW mDoExt_btkAnm();
if (a_this->mpZoomBtk == NULL) {
return 0;
}
@@ -2035,12 +2035,12 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
a_this->mpBeamModelMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_gm", 0x21), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gm", 7), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284);
a_this->mpBeamModelMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_gm", 0x21), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gm", 7), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284);
if (a_this->mpBeamModelMorf == NULL || a_this->mpBeamModelMorf->getModel() == NULL) {
return 0;
}
a_this->mpBeamBtk = new mDoExt_btkAnm();
a_this->mpBeamBtk = JKR_NEW mDoExt_btkAnm();
if (a_this->mpBeamBtk == NULL) {
return 0;
}
@@ -2061,7 +2061,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
a_this->mSpotLightSize[i] = 1.0f;
}
a_this->mpSpotLightBtk = new mDoExt_btkAnm();
a_this->mpSpotLightBtk = JKR_NEW mDoExt_btkAnm();
if (a_this->mpSpotLightBtk == NULL) {
return 0;
}
src/d/actor/d_a_b_gnd.cpp
+8 -8
View File
@@ -4592,7 +4592,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
static int const blur_model[2] = {0x66, 0x65};
static int btk_d[6] = {0x77, 0x76, 0x73, 0x74, 0x75, 0x72};
i_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_gnd", 0x69),
i_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_gnd", 0x69),
NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gnd", 0x4b),
2, 1.0f, 0, -1, &i_this->mGndSound, 0, 0x11020284);
@@ -4610,7 +4610,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
mDoMtx_stack_c::scaleS(0.0f, 0.0f, 0.0f);
model->setBaseTRMtx(mDoMtx_stack_c::get());
i_this->mpGndCoreBrk = new mDoExt_brkAnm();
i_this->mpGndCoreBrk = JKR_NEW mDoExt_brkAnm();
if (i_this->mpGndCoreBrk == NULL) {
return 0;
}
@@ -4622,7 +4622,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
}
for (int i = 0; i < 6; i++) {
i_this->mpGndEyeBtk[i] = new mDoExt_btkAnm();
i_this->mpGndEyeBtk[i] = JKR_NEW mDoExt_btkAnm();
if (i_this->mpGndEyeBtk[i] == NULL) {
return 0;
}
@@ -4634,7 +4634,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
}
}
i_this->mpGndEyeBtp = new mDoExt_btpAnm();
i_this->mpGndEyeBtp = JKR_NEW mDoExt_btpAnm();
if (i_this->mpGndEyeBtp == NULL) {
return 0;
}
@@ -4690,7 +4690,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
i_this->mpMantShadowModel[i]->setBaseTRMtx(mDoMtx_stack_c::get());
}
i_this->mpHorseMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_hg", 19),
i_this->mpHorseMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_hg", 19),
NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_hg", 15),
2, 1.0f, 0, -1, &i_this->mHorseSound, 0x80000, 0x11000084);
if (i_this->mpHorseMorf == NULL || i_this->mpHorseMorf->getModel() == NULL) {
@@ -4728,14 +4728,14 @@ static int useHeapInit(fopAc_ac_c* a_this) {
size++;
}
i_this->mpZeldaModel = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_gnd", 0x6a),
i_this->mpZeldaModel = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_gnd", 0x6a),
NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gnd", 0x5e),
0, 1.0f, 0, -1, 1, NULL, 0, 0x11020284);
if (i_this->mpZeldaModel == NULL || i_this->mpZeldaModel->getModel() == NULL) {
return 0;
}
i_this->mpZeldaBtk = new mDoExt_btkAnm();
i_this->mpZeldaBtk = JKR_NEW mDoExt_btkAnm();
if (i_this->mpZeldaBtk == NULL) {
return 0;
}
@@ -4746,7 +4746,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return 0;
}
i_this->mpZeldaBtp = new mDoExt_btpAnm();
i_this->mpZeldaBtp = JKR_NEW mDoExt_btpAnm();
if (i_this->mpZeldaBtp == NULL) {
return 0;
}
src/d/actor/d_a_b_go.cpp
+1 -1
View File
@@ -209,7 +209,7 @@ static int daB_GO_Delete(b_go_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
b_go_class* a_this = (b_go_class*)i_this;
a_this->mpMorf = new mDoExt_McaMorfSO(
a_this->mpMorf = JKR_NEW mDoExt_McaMorfSO(
(J3DModelData*)dComIfG_getObjectRes("B_go", RES_IS_MODEL), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("B_go", ANM_WAIT_03), J3DFrameCtrl::EMode_LOOP,
1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11000084);
src/d/actor/d_a_b_gos.cpp
+1 -1
View File
@@ -328,7 +328,7 @@ static int daB_GOS_Delete(b_gos_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
b_gos_class* a_this = (b_gos_class*)i_this;
a_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_gos", 9), NULL,
a_this->mpMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_gos", 9), NULL,
NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gos", 6),
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, &a_this->mSound,
0x80000, 0x11000084);
src/d/actor/d_a_b_mgn.cpp
+7 -7
View File
@@ -3386,7 +3386,7 @@ static int daB_MGN_Delete(daB_MGN_c* i_this) {
int daB_MGN_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_mgn", BMDR_MGN);
JUT_ASSERT(4010, modelData != NULL);
mpMgnModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL,
mpMgnModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("B_mgn", BCK_MGN_WAIT),2,
1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, 0x11000284);
if (mpMgnModelMorf == NULL || mpMgnModelMorf->getModel() == NULL) {
@@ -3402,7 +3402,7 @@ int daB_MGN_c::CreateHeap() {
}
}
mpMgnCoreBrk = new mDoExt_brkAnm();
mpMgnCoreBrk = JKR_NEW mDoExt_brkAnm();
if (mpMgnCoreBrk == NULL) {
return 0;
}
@@ -3413,7 +3413,7 @@ int daB_MGN_c::CreateHeap() {
return 0;
}
mpMgnBtk = new mDoExt_btkAnm();
mpMgnBtk = JKR_NEW mDoExt_btkAnm();
if (mpMgnBtk == NULL) {
return 0;
}
@@ -3439,14 +3439,14 @@ int daB_MGN_c::CreateHeap() {
JUT_ASSERT(4084, modelData != NULL);
for (int i = 0; i < 4; i++) {
mpGdgateModelMorf[i] = new mDoExt_McaMorfSO(modelData, NULL, NULL,
mpGdgateModelMorf[i] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("B_mgne", BCK_EF_GDGATE_START),
0, 0.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, 0x11000284);
if (mpGdgateModelMorf[i] == NULL || mpGdgateModelMorf[i]->getModel() == NULL) {
return 0;
}
mpGdgateStartBrk[i] = new mDoExt_brkAnm();
mpGdgateStartBrk[i] = JKR_NEW mDoExt_brkAnm();
if (mpGdgateStartBrk[i] == NULL) {
return 0;
}
@@ -3458,7 +3458,7 @@ int daB_MGN_c::CreateHeap() {
return 0;
}
mpGdgateAppearBrk[i] = new mDoExt_brkAnm();
mpGdgateAppearBrk[i] = JKR_NEW mDoExt_brkAnm();
if (mpGdgateAppearBrk[i] == NULL) {
return 0;
}
@@ -3470,7 +3470,7 @@ int daB_MGN_c::CreateHeap() {
return 0;
}
mpGdgateBtk[i] = new mDoExt_btkAnm();
mpGdgateBtk[i] = JKR_NEW mDoExt_btkAnm();
if (mpGdgateBtk[i] == NULL) {
return 0;
}
src/d/actor/d_a_b_ob.cpp
+8 -8
View File
@@ -3290,7 +3290,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
b_ob_class* a_this = (b_ob_class*)i_this;
a_this->mpCoreMorf =
new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDV_OH_CORE), NULL, NULL,
JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDV_OH_CORE), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("B_oh", BCK_OH_CORE_OPEN), 2, 1.0f, 0, -1,
&a_this->mSound, 0, 0x11000084);
@@ -3304,7 +3304,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
a_this->mBodyParts[i].mpMorf =
new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", p_bmd[i]), NULL, NULL,
JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", p_bmd[i]), NULL, NULL,
NULL, 2, 1.0f, 0, -1, 1, NULL, var_r31, 0x11000084);
if (a_this->mBodyParts[i].mpMorf == NULL ||
@@ -3335,7 +3335,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
if (i >= 4 && i <= 17) {
a_this->mBodyParts[i].mpFinMorf =
new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_OI_FINA), NULL, NULL,
JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_OI_FINA), NULL, NULL,
NULL, 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084);
if (a_this->mBodyParts[i].mpFinMorf == NULL ||
@@ -3366,7 +3366,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
if (i >= 7 && i <= 15) {
a_this->mBodyParts[i].mpFinUnkMorf =
new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_OI_FINA), NULL, NULL,
JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_OI_FINA), NULL, NULL,
NULL, 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084);
if (a_this->mBodyParts[i].mpFinUnkMorf == NULL ||
@@ -3391,7 +3391,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
if (i == 8) {
a_this->mBodyParts[i].mpFinBMorf =
new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_OI_FINB), NULL, NULL,
JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_OI_FINB), NULL, NULL,
NULL, 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084);
if (a_this->mBodyParts[i].mpFinBMorf == NULL ||
@@ -3416,7 +3416,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
if (i == 17) {
a_this->mBodyParts[i].mpFinCMorf =
new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_OI_FINC), NULL, NULL,
JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_OI_FINC), NULL, NULL,
NULL, 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084);
if (a_this->mBodyParts[i].mpFinCMorf == NULL ||
@@ -3454,7 +3454,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
modelData->getJointNodePointer(j)->setCallBack(sui_nodeCallBack);
}
a_this->mpSuiBrk = new mDoExt_brkAnm();
a_this->mpSuiBrk = JKR_NEW mDoExt_brkAnm();
if (a_this->mpSuiBrk == NULL) {
return 0;
}
@@ -3463,7 +3463,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
a_this->mpSuiBtk = new mDoExt_btkAnm();
a_this->mpSuiBtk = JKR_NEW mDoExt_btkAnm();
if (a_this->mpSuiBtk == NULL) {
return 0;
}
src/d/actor/d_a_b_oh.cpp
+3 -3
View File
@@ -705,7 +705,7 @@ static int daB_OH_Delete(b_oh_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
b_oh_class* this_ = (b_oh_class*)i_this;
this_->mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDV_OH), NULL,
this_->mpMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDV_OH), NULL,
NULL, NULL, 2, 1.0f, 0, -1, 1, NULL, 0, 0x11000284);
if (this_->mpMorf == NULL || this_->mpMorf->getModel() == NULL) {
return 0;
@@ -722,7 +722,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
nodeCallBack);
}
this_->mpBtk = new mDoExt_btkAnm();
this_->mpBtk = JKR_NEW mDoExt_btkAnm();
if (this_->mpBtk == NULL) {
return 0;
}
@@ -735,7 +735,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
this_->mpBtk->setFrame(cM_rndF(39.0f));
this_->mpBtk->setPlaySpeed(cM_rndFX(0.1f) + 1.0f);
this_->mpBrk = new mDoExt_brkAnm();
this_->mpBrk = JKR_NEW mDoExt_brkAnm();
if (this_->mpBrk == NULL) {
return 0;
}
src/d/actor/d_a_b_oh2.cpp
+3 -3
View File
@@ -217,7 +217,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
b_oh2_class* _this = static_cast<b_oh2_class*>(i_this);
_this->mpMorf =
new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_oh", 0x29), NULL, NULL, NULL, 2,
JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_oh", 0x29), NULL, NULL, NULL, 2,
1.0f, 0, -1, &_this->mZ2Enemy, 0, 0x11000284);
if (_this->mpMorf == NULL || _this->mpMorf->getModel() == NULL) {
@@ -235,7 +235,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
nodeCallBack);
}
_this->mpBtk = new mDoExt_btkAnm();
_this->mpBtk = JKR_NEW mDoExt_btkAnm();
if (_this->mpBtk == NULL) {
return 0;
}
@@ -248,7 +248,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
_this->mpBtk->setFrame(cM_rndF(39.0f));
_this->mpBtk->setPlaySpeed(cM_rndFX(0.1f) + 1.0f);
_this->mpBrk = new mDoExt_brkAnm();
_this->mpBrk = JKR_NEW mDoExt_brkAnm();
if (_this->mpBrk == NULL) {
return 0;
}
src/d/actor/d_a_b_tn.cpp
+4 -4
View File
@@ -4937,7 +4937,7 @@ int daB_TN_c::CreateHeap() {
modelData = (J3DModelData*)dComIfG_getObjectRes("B_tnp2", BMDR_TN2);
}
mpModelMorf2 = new mDoExt_McaMorfSO(modelData, NULL, NULL,
mpModelMorf2 = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("B_tn", BCK_TNA_WAIT), 0, 1.0f,
0, -1, &mSound, 0x80000, 0x11000084);
if (mpModelMorf2 == NULL || mpModelMorf2->getModel() == NULL) {
@@ -4945,7 +4945,7 @@ int daB_TN_c::CreateHeap() {
}
if (mType == 1) {
mpBrkAnm = new mDoExt_brkAnm();
mpBrkAnm = JKR_NEW mDoExt_brkAnm();
if (mpBrkAnm == NULL) {
return 0;
}
@@ -4985,7 +4985,7 @@ int daB_TN_c::CreateHeap() {
}
if (sVar1 != -1) {
mpBrkAnms[i] = new mDoExt_brkAnm();
mpBrkAnms[i] = JKR_NEW mDoExt_brkAnm();
mDoExt_brkAnm* myanm = mpBrkAnms[i];
if (myanm == NULL) {
@@ -5005,7 +5005,7 @@ int daB_TN_c::CreateHeap() {
modelData = (J3DModelData*)dComIfG_getObjectRes(mArcName, tn_part_model_id[mType * 0x10 + 0xf]);
mpModelMorf1 = new mDoExt_McaMorfSO(modelData, NULL, NULL,
mpModelMorf1 = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("B_tn", BCK_TNB_SWORD_B_PULL_A), 0, 1.0f,
0, -1, &mSound, 0x80000, 0x11000084);
if (mpModelMorf1 == NULL || mpModelMorf1->getModel() == NULL) {
src/d/actor/d_a_b_yo.cpp
+10 -10
View File
@@ -3109,7 +3109,7 @@ int daB_YO_c::CreateHeap() {
}
model_data = (J3DModelData*)dComIfG_getObjectRes("B_YO", BMDE_YKW_B);
mpYetaMorf = new mDoExt_McaMorfSO(
mpYetaMorf = JKR_NEW mDoExt_McaMorfSO(
model_data, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_YO", BCK_YKW_B_WAITA),
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, &mCreatureSound, 0, 0x11020284
);
@@ -3117,7 +3117,7 @@ int daB_YO_c::CreateHeap() {
return 0;
}
mpBtkAnm = new mDoExt_btkAnm();
mpBtkAnm = JKR_NEW mDoExt_btkAnm();
if (mpBtkAnm == NULL) {
return 0;
}
@@ -3128,7 +3128,7 @@ int daB_YO_c::CreateHeap() {
}
model_data = mpYetaMorf->getModel()->getModelData();
mpYetaBtkAnm = new mDoExt_btkAnm();
mpYetaBtkAnm = JKR_NEW mDoExt_btkAnm();
if (mpYetaBtkAnm == NULL) {
return 0;
}
@@ -3137,7 +3137,7 @@ int daB_YO_c::CreateHeap() {
return 0;
}
mpYetaBtpAnm = new mDoExt_btpAnm();
mpYetaBtpAnm = JKR_NEW mDoExt_btpAnm();
if (mpYetaBtpAnm == NULL) {
return 5;
}
@@ -3146,7 +3146,7 @@ int daB_YO_c::CreateHeap() {
return 5;
}
mpYetaBrkAnm = new mDoExt_brkAnm();
mpYetaBrkAnm = JKR_NEW mDoExt_brkAnm();
if (mpYetaBrkAnm == NULL) {
return 0;
}
@@ -3155,7 +3155,7 @@ int daB_YO_c::CreateHeap() {
return 0;
}
mpYetaWhiteBrkAnm = new mDoExt_brkAnm();
mpYetaWhiteBrkAnm = JKR_NEW mDoExt_brkAnm();
if (mpYetaWhiteBrkAnm == NULL) {
return 0;
}
@@ -3164,7 +3164,7 @@ int daB_YO_c::CreateHeap() {
return 0;
}
mpRoomNormalBgW = new dBgW();
mpRoomNormalBgW = JKR_NEW dBgW();
if (mpRoomNormalBgW == NULL) {
return 0;
}
@@ -3180,7 +3180,7 @@ int daB_YO_c::CreateHeap() {
return 0;
}
mpRoomArenaBgW = new dBgW();
mpRoomArenaBgW = JKR_NEW dBgW();
if (mpRoomArenaBgW == NULL) {
return 0;
}
@@ -3203,7 +3203,7 @@ int daB_YO_c::CreateHeap() {
}
model_data = (J3DModelData*)dComIfG_getObjectRes("ykW", 0xb);
mpYetaRevertedMorf = new mDoExt_McaMorfSO(
mpYetaRevertedMorf = JKR_NEW mDoExt_McaMorfSO(
model_data, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("ykW1", 0x1a),
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, &mCreatureSound, 0, 0x11000084
);
@@ -3219,7 +3219,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
int daB_YO_c::CreateHeap2() {
mpRoomNormalBgW = new dBgW();
mpRoomNormalBgW = JKR_NEW dBgW();
if (mpRoomNormalBgW == NULL) {
return 0;
}
src/d/actor/d_a_b_zant.cpp
+6 -6
View File
@@ -5382,7 +5382,7 @@ static int daB_ZANT_Delete(daB_ZANT_c* i_this) {
int daB_ZANT_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", BMDR_ZAN);
JUT_ASSERT(0, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_zan", BCK_ZAN_FLOAT_WAIT), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084);
mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_zan", BCK_ZAN_FLOAT_WAIT), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
return 0;
}
@@ -5397,7 +5397,7 @@ int daB_ZANT_c::CreateHeap() {
return 0;
}
mpMahojinEndBrk = new mDoExt_brkAnm();
mpMahojinEndBrk = JKR_NEW mDoExt_brkAnm();
if (mpMahojinEndBrk == NULL) {
return 0;
}
@@ -5406,7 +5406,7 @@ int daB_ZANT_c::CreateHeap() {
return 0;
}
mpMahojinBtk = new mDoExt_btkAnm();
mpMahojinBtk = JKR_NEW mDoExt_btkAnm();
if (mpMahojinBtk == NULL) {
return 0;
}
@@ -5415,7 +5415,7 @@ int daB_ZANT_c::CreateHeap() {
return 0;
}
mpMahojinStartBtk = new mDoExt_btkAnm();
mpMahojinStartBtk = JKR_NEW mDoExt_btkAnm();
if (mpMahojinStartBtk == NULL) {
return 0;
}
@@ -5429,7 +5429,7 @@ int daB_ZANT_c::CreateHeap() {
return 0;
}
mpMahojinBrk2 = new mDoExt_brkAnm();
mpMahojinBrk2 = JKR_NEW mDoExt_brkAnm();
if (mpMahojinBrk2 == NULL) {
return 0;
}
@@ -5438,7 +5438,7 @@ int daB_ZANT_c::CreateHeap() {
return 0;
}
mpMahojinStartBtk2 = new mDoExt_btkAnm();
mpMahojinStartBtk2 = JKR_NEW mDoExt_btkAnm();
if (mpMahojinStartBtk2 == NULL) {
return 0;
}
src/d/actor/d_a_b_zant_mobile.cpp
+3 -3
View File
@@ -403,12 +403,12 @@ int daB_ZANTZ_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", daB_ZANT_c::BMDR_ZZ);
JUT_ASSERT(0, modelData != NULL);
mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_zan", daB_ZANT_c::BCK_ZZ_OPEN), 0, 0.0f, 0, -1, &mSound, 0, 0x11000084);
mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_zan", daB_ZANT_c::BCK_ZZ_OPEN), 0, 0.0f, 0, -1, &mSound, 0, 0x11000084);
if (mpMorf == NULL) {
return 0;
}
mpBrk = new mDoExt_brkAnm();
mpBrk = JKR_NEW mDoExt_brkAnm();
if (mpBrk == NULL) {
return 0;
}
@@ -417,7 +417,7 @@ int daB_ZANTZ_c::CreateHeap() {
return 0;
}
mpBgW = new dBgW();
mpBgW = JKR_NEW dBgW();
if (mpBgW == NULL) {
return 0;
}
src/d/actor/d_a_b_zant_sima.cpp
+3 -3
View File
@@ -150,7 +150,7 @@ int daB_ZANTS_c::CreateHeap() {
return FALSE;
}
mpBtkAnm = new mDoExt_btkAnm();
mpBtkAnm = JKR_NEW mDoExt_btkAnm();
if (mpBtkAnm == NULL) {
return FALSE;
}
@@ -162,7 +162,7 @@ int daB_ZANTS_c::CreateHeap() {
return FALSE;
}
mpBrkAnm = new mDoExt_brkAnm();
mpBrkAnm = JKR_NEW mDoExt_brkAnm();
if (mpBrkAnm == NULL) {
return FALSE;
}
@@ -174,7 +174,7 @@ int daB_ZANTS_c::CreateHeap() {
return FALSE;
}
mpBgW = new dBgW();
mpBgW = JKR_NEW dBgW();
if (mpBgW == NULL) {
return FALSE;
}
src/d/actor/d_a_balloon_2D.cpp
+15 -15
View File
@@ -155,7 +155,7 @@ static int daBalloon2D_createHeap(fopAc_ac_c* i_this) {
static char* l_arcName = "Balloon2D";
int daBalloon2D_c::createHeap() {
mScreen = new J2DScreen();
mScreen = JKR_NEW J2DScreen();
if (mScreen == NULL) {
return 0;
}
@@ -164,26 +164,26 @@ int daBalloon2D_c::createHeap() {
JKRArchive* arc = resInfo->getArchive();
mScreen->setPriority("zelda_balloon_game.blo", 0x20000, arc);
dPaneClass_showNullPane(mScreen);
field_0x578 = new CPaneMgr(mScreen, MULTI_CHAR('n_all'), 2, NULL);
field_0x57c = new CPaneMgr(mScreen, MULTI_CHAR('score_tn'), 0, NULL);
field_0x580 = new CPaneMgr(mScreen, MULTI_CHAR('suji_n'), 2, NULL);
field_0x584 = new CPaneMgr(mScreen, MULTI_CHAR('s_set_n'), 0, NULL);
field_0x588 = new CPaneMgr(mScreen, MULTI_CHAR('tas_n'), 0, NULL);
field_0x58c = new CPaneMgr(mScreen, MULTI_CHAR('combo_tn'), 0, NULL);
field_0x590 = new CPaneMgr(mScreen, MULTI_CHAR('num_n'), 0, NULL);
field_0x594 = new CPaneMgr(mScreen, MULTI_CHAR('co_set_n'), 2, NULL);
field_0x598 = new CPaneMgr(mScreen, MULTI_CHAR('bal_3_n'), 2, NULL);
field_0x59c = new CPaneMgr(mScreen, MULTI_CHAR('bal_2_n'), 2, NULL);
field_0x5a0 = new CPaneMgr(mScreen, MULTI_CHAR('bal_1_n'), 2, NULL);
field_0x5a4 = new CPaneMgr(mScreen, MULTI_CHAR('ba_com_n'), 2, NULL);
field_0x578 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('n_all'), 2, NULL);
field_0x57c = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('score_tn'), 0, NULL);
field_0x580 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('suji_n'), 2, NULL);
field_0x584 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('s_set_n'), 0, NULL);
field_0x588 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('tas_n'), 0, NULL);
field_0x58c = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('combo_tn'), 0, NULL);
field_0x590 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('num_n'), 0, NULL);
field_0x594 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('co_set_n'), 2, NULL);
field_0x598 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('bal_3_n'), 2, NULL);
field_0x59c = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('bal_2_n'), 2, NULL);
field_0x5a0 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('bal_1_n'), 2, NULL);
field_0x5a4 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('ba_com_n'), 2, NULL);
field_0x578->setAlphaRate(0.0f);
field_0x5a4->setAlphaRate(0.0f);
for (s32 i = 0; i < 10; i++) {
ResTIMG* resTimg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getNumberTextureName(i));
field_0x5c4[i] = new J2DPicture(resTimg);
field_0x5c4[i] = JKR_NEW J2DPicture(resTimg);
}
ResTIMG* resTimg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getPlusTextureName());
field_0x5ec = new J2DPicture(resTimg);
field_0x5ec = JKR_NEW J2DPicture(resTimg);
if (field_0x578 == NULL || field_0x57c == NULL || field_0x580 == NULL ||
field_0x584 == NULL ||field_0x588 == NULL || field_0x58c == NULL ||
field_0x590 == NULL || field_0x594 == NULL || field_0x598 == NULL ||
src/d/actor/d_a_bd.cpp
+2 -2
View File
@@ -943,14 +943,14 @@ static int daBd_Delete(bd_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
bd_class* a_this = (bd_class*)i_this;
a_this->mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Bd", 0xE), NULL, NULL,
a_this->mpMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Bd", 0xE), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("Bd", 8), 0, 1.0f, 0,
-1, 1, NULL, 0x80000, 0x11000284);
if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) {
return 0;
}
a_this->mpBtk = new mDoExt_btkAnm();
a_this->mpBtk = JKR_NEW mDoExt_btkAnm();
if (a_this->mpBtk == NULL) {
return 0;
}
src/d/actor/d_a_bg.cpp
+8 -8
View File
@@ -29,7 +29,7 @@ static int createMatAnm(J3DModelData* i_modelData, u16 i_materialID) {
J3DMaterial* material = i_modelData->getMaterialNodePointer(i_materialID);
if (material->getMaterialAnm() == NULL) {
J3DMaterialAnm* anm = new J3DMaterialAnm();
J3DMaterialAnm* anm = JKR_NEW J3DMaterialAnm();
if (anm == NULL) {
return 0;
}
@@ -46,7 +46,7 @@ static u8 const lit_3756[12] = {
};
int daBg_btkAnm_c::create(J3DModelData* i_modelData, J3DAnmTextureSRTKey* i_btk, int i_anmPlay) {
mpBtk = new mDoExt_btkAnm();
mpBtk = JKR_NEW mDoExt_btkAnm();
if (mpBtk == NULL) {
return 0;
}
@@ -75,7 +75,7 @@ void daBg_btkAnm_c::play() {
}
int daBg_brkAnm_c::create(J3DModelData* i_modelData, J3DAnmTevRegKey* i_brk, int i_anmPlay) {
mpBrk = new mDoExt_brkAnm();
mpBrk = JKR_NEW mDoExt_brkAnm();
if (mpBrk == NULL) {
return 0;
@@ -143,7 +143,7 @@ int daBg_c::createHeap() {
J3DAnmTextureSRTKey* btk =
(J3DAnmTextureSRTKey*)dComIfG_getStageRes(arcName, l_btkName[i]);
if (btk != NULL) {
bgPart->btk = new daBg_btkAnm_c();
bgPart->btk = JKR_NEW daBg_btkAnm_c();
if (bgPart->btk == NULL) {
return 0;
}
@@ -160,7 +160,7 @@ int daBg_c::createHeap() {
J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getStageRes(arcName, l_brkName[i]);
if (brk != NULL) {
bgPart->brk = new daBg_brkAnm_c();
bgPart->brk = JKR_NEW daBg_brkAnm_c();
if (bgPart->brk == NULL) {
return 0;
}
@@ -195,7 +195,7 @@ int daBg_c::createHeap() {
return 0;
}
bgPart->tevstr = new dKy_tevstr_c();
bgPart->tevstr = JKR_NEW dKy_tevstr_c();
if (bgPart->tevstr == NULL) {
return 0;
}
@@ -209,7 +209,7 @@ int daBg_c::createHeap() {
cBgD_t* dzb = (cBgD_t*)dComIfG_getStageRes(arcName, "room.dzb");
if (dzb != NULL) {
mpKCol = NULL;
mpBgW = new dBgW();
mpBgW = JKR_NEW dBgW();
if (mpBgW == NULL) {
return 0;
}
@@ -226,7 +226,7 @@ int daBg_c::createHeap() {
if (kcl != NULL && plc != NULL) {
mpBgW = NULL;
mpKCol = new dBgWKCol();
mpKCol = JKR_NEW dBgWKCol();
if (mpKCol == NULL) {
return 0;
}
src/d/actor/d_a_bg_obj.cpp
+5 -5
View File
@@ -545,7 +545,7 @@ int daBgObj_c::CreateHeapType0() {
J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(
daSetBgObj_c::getArcName(this), getBtkName(0, i));
if (btk != NULL) {
field_0x5b8[0][i] = new mDoExt_btkAnm();
field_0x5b8[0][i] = JKR_NEW mDoExt_btkAnm();
if (field_0x5b8[0][i] == NULL ||
!field_0x5b8[0][i]->init(modelData, btk, TRUE, 2, 1.0f, 0, -1))
{
@@ -558,7 +558,7 @@ int daBgObj_c::CreateHeapType0() {
J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(
daSetBgObj_c::getArcName(this), getBrkName(0, i));
if (brk != NULL) {
field_0x5c8[0][i] = new mDoExt_brkAnm();
field_0x5c8[0][i] = JKR_NEW mDoExt_brkAnm();
if (field_0x5c8[0][i] == NULL ||
!field_0x5c8[0][i]->init(modelData, brk, TRUE, 2, 1.0f, 0, -1))
{
@@ -596,7 +596,7 @@ int daBgObj_c::CreateHeapType1() {
J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(
daSetBgObj_c::getArcName(this), getBtkName(i, j));
if (btk != NULL) {
field_0x5b8[i][j] = new mDoExt_btkAnm();
field_0x5b8[i][j] = JKR_NEW mDoExt_btkAnm();
if (field_0x5b8[i][j] == NULL ||
!field_0x5b8[i][j]->init(modelData, btk, TRUE, 2, 1.0f, 0,
-1))
@@ -610,7 +610,7 @@ int daBgObj_c::CreateHeapType1() {
J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(
daSetBgObj_c::getArcName(this), getBrkName(i, j));
if (brk != NULL) {
field_0x5c8[i][j] = new mDoExt_brkAnm();
field_0x5c8[i][j] = JKR_NEW mDoExt_brkAnm();
if (field_0x5c8[i][j] == NULL ||
!field_0x5c8[i][j]->init(modelData, brk, TRUE, 2, 1.0f, 0,
-1))
@@ -628,7 +628,7 @@ int daBgObj_c::CreateHeapType1() {
cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), getDzbName(1));
if (dzb != NULL) {
mpBgW2 = new dBgW();
mpBgW2 = JKR_NEW dBgW();
if (mpBgW2 == NULL || mpBgW2->Set(dzb, cBgW::MOVE_BG_e, &mBgMtx)) {
mpBgW2 = NULL;
return 0;
src/d/actor/d_a_boomerang.cpp
+3 -3
View File
@@ -18,7 +18,7 @@ int daBoomerang_sight_c::createHeap() {
void* tmpData;
JKRArchive* archive = dComIfG_getObjectResInfo(daAlink_c::getAlinkArcName())->getArchive();
m_cursorYellowScrn = new J2DScreen();
m_cursorYellowScrn = JKR_NEW J2DScreen();
if (m_cursorYellowScrn == NULL) {
return 0;
}
@@ -54,7 +54,7 @@ int daBoomerang_sight_c::createHeap() {
return 0;
}
m_cursorRedScrn = new J2DScreen();
m_cursorRedScrn = JKR_NEW J2DScreen();
if (m_cursorRedScrn == NULL) {
return 0;
}
@@ -76,7 +76,7 @@ int daBoomerang_sight_c::createHeap() {
return 0;
}
m_cursorOrangeScrn = new J2DScreen();
m_cursorOrangeScrn = JKR_NEW J2DScreen();
if (m_cursorOrangeScrn == NULL) {
return 0;
}
src/d/actor/d_a_coach_2D.cpp
+6 -6
View File
@@ -107,7 +107,7 @@ static char* l_arcName = "Coach2D";
static daCoach2D_HIO_c l_HOSTIO;
int daCoach2D_c::createHeap() {
mpScrn = new J2DScreen();
mpScrn = JKR_NEW J2DScreen();
if (mpScrn == NULL) {
return 0;
}
@@ -124,15 +124,15 @@ int daCoach2D_c::createHeap() {
mpFireIconBrk->searchUpdateMaterialID(mpScrn);
setBrkAnime(true);
mpPaneAll = new CPaneMgr(mpScrn, MULTI_CHAR('n_all'), 2, NULL);
mpPaneBasha = new CPaneMgr(mpScrn, MULTI_CHAR('basha_n'), 2, NULL);
mpPaneFire = new CPaneMgr(mpScrn, MULTI_CHAR('fire_n'), 2, NULL);
mpPaneAll = JKR_NEW CPaneMgr(mpScrn, MULTI_CHAR('n_all'), 2, NULL);
mpPaneBasha = JKR_NEW CPaneMgr(mpScrn, MULTI_CHAR('basha_n'), 2, NULL);
mpPaneFire = JKR_NEW CPaneMgr(mpScrn, MULTI_CHAR('fire_n'), 2, NULL);
mpScrn->search(MULTI_CHAR('fire_b_n'))->move(mpPaneFire->getPosX(), mpPaneFire->getPosY());
mpPaneFireB = new CPaneMgr(mpScrn, MULTI_CHAR('fire_b_n'), 2, NULL);
mpPaneFireB = JKR_NEW CPaneMgr(mpScrn, MULTI_CHAR('fire_b_n'), 2, NULL);
mMsgLight = new dMsgScrnLight_c(6, 0xFF);
mMsgLight = JKR_NEW dMsgScrnLight_c(6, 0xFF);
if (mpPaneAll == NULL || mpPaneBasha == NULL || mpPaneFire == NULL || mpPaneFireB == NULL || mMsgLight == NULL) {
return 0;
src/d/actor/d_a_cow.cpp
+2 -2
View File
@@ -2975,7 +2975,7 @@ int daCow_c::CreateHeap() {
JUT_ASSERT(3826, NULL != modelData);
int r24 = 0x11020084;
mpMorf =
new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, r24);
JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, r24);
if (!mpMorf || !mpMorf->getModel()) {
return cPhs_INIT_e;
@@ -2990,7 +2990,7 @@ int daCow_c::CreateHeap() {
}
setBck(daCow_c::Animation_WaitA, J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f);
mpBtp = new mDoExt_btpAnm();
mpBtp = JKR_NEW mDoExt_btpAnm();
if (mpBtp == NULL) {
return cPhs_ERROR_e;
src/d/actor/d_a_cstaF.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ int daCstaF_c::CreateHeap() {
const data* data_p = &dataTbl[m_type];
void* pbck = dComIfG_getObjectRes(m_arcName, data_p->bck_idx);
mp_modelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(m_arcName, data_p->bmd_idx), NULL, NULL, (J3DAnmTransform*)pbck, 0, 0.0f, 0, -1, &m_sound, 0x80000, 0x11000284);
mp_modelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(m_arcName, data_p->bmd_idx), NULL, NULL, (J3DAnmTransform*)pbck, 0, 0.0f, 0, -1, &m_sound, 0x80000, 0x11000284);
if (mp_modelMorf == NULL || mp_modelMorf->getModel() == NULL) {
return 0;
}
src/d/actor/d_a_cstatue.cpp
+5 -5
View File
@@ -158,7 +158,7 @@ int daCstatue_c::createHeap() {
resource_index = data->modelIndex;
}
mpMorf = new mDoExt_McaMorfSO(
mpMorf = JKR_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_DifferedDLBuffer, data->morfIndex);
@@ -180,20 +180,20 @@ int daCstatue_c::createHeap() {
}
if (checkBossType()) {
mSph = new dCcD_Sph[9]();
mSph = JKR_NEW dCcD_Sph[9]();
if (!mSph) {
return cPhs_INIT_e;
}
} else if (mType == daCstatueType_Normal) {
mCps1 = new dCcD_Cps();
mCps1 = JKR_NEW dCcD_Cps();
if (!mCps1) {
return cPhs_INIT_e;
}
mCps2 = new dCcD_Cps();
mCps2 = JKR_NEW dCcD_Cps();
if (!mCps2) {
return cPhs_INIT_e;
}
mCyl2 = new dCcD_Cyl();
mCyl2 = JKR_NEW dCcD_Cyl();
if (!mCyl2) {
return cPhs_INIT_e;
}
src/d/actor/d_a_demo00.cpp
+11 -11
View File
@@ -204,7 +204,7 @@ static BOOL awaCheck(J3DModel* i_model) {
for (u16 i = 0; i < texture->getNum(); i++) {
const char* name = nameTab->getName(i);
if (strcmp(name, "B_dummy") == 0 || strcmp(name, "cy_kankyo") == 0) {
J3DSkinDeform* skinDeform = new J3DSkinDeform();
J3DSkinDeform* skinDeform = JKR_NEW J3DSkinDeform();
if (skinDeform == NULL) {
return FALSE;
}
@@ -251,7 +251,7 @@ int daDemo00_c::createHeap() {
}
if (mModel.mID.field_0xc != -1) {
mModel.mpBtpAnm = new mDoExt_btpAnm();
mModel.mpBtpAnm = JKR_NEW mDoExt_btpAnm();
if (mModel.mpBtpAnm == NULL) {
return 0;
}
@@ -271,7 +271,7 @@ int daDemo00_c::createHeap() {
}
if (mModel.mID.field_0x10 != -1) {
mModel.mpBtkAnm = new mDoExt_btkAnm();
mModel.mpBtkAnm = JKR_NEW mDoExt_btkAnm();
if (mModel.mpBtkAnm == NULL) {
return 0;
}
@@ -295,7 +295,7 @@ int daDemo00_c::createHeap() {
}
if (mModel.mID.field_0x14 != -1) {
mModel.mpBrkAnm = new mDoExt_brkAnm();
mModel.mpBrkAnm = JKR_NEW mDoExt_brkAnm();
if (mModel.mpBrkAnm == NULL) {
return 0;
}
@@ -313,7 +313,7 @@ int daDemo00_c::createHeap() {
}
if (mModel.mID.field_0x8 != -1) {
mModel.mpBpkAnm = new mDoExt_bpkAnm();
mModel.mpBpkAnm = JKR_NEW mDoExt_bpkAnm();
if (mModel.mpBpkAnm == NULL) {
return 0;
}
@@ -352,9 +352,9 @@ int daDemo00_c::createHeap() {
}
if (field_0x6ad == 0) {
mModel.mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, anm, -1, 1.0f, 0, -1, &mSound, 0x80000, uVar1);
mModel.mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, anm, -1, 1.0f, 0, -1, &mSound, 0x80000, uVar1);
} else {
mModel.mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, anm, -1, 1.0f, 0, -1, &mSound, 0, uVar1);
mModel.mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, anm, -1, 1.0f, 0, -1, &mSound, 0, uVar1);
}
if (mModel.mpModelMorf == NULL || mModel.mpModelMorf->getModel() == NULL) {
@@ -369,7 +369,7 @@ int daDemo00_c::createHeap() {
}
if (field_0x6b4 != 0) {
mModel.field_0x5d8 = new mDoExt_invisibleModel();
mModel.field_0x5d8 = JKR_NEW mDoExt_invisibleModel();
if (mModel.field_0x5d8 == NULL) {
return 0;
}
@@ -383,7 +383,7 @@ int daDemo00_c::createHeap() {
mModel.mID.field_0x18 = 1;
if (mModel.mID.field_0x18 != -1) {
mModel.mShadow = new daDemo00_shadow_c();
mModel.mShadow = JKR_NEW daDemo00_shadow_c();
if (mModel.mShadow == NULL) {
return 0;
}
@@ -395,7 +395,7 @@ int daDemo00_c::createHeap() {
setShadowSize();
}
mModel.mBgc = new daDemo00_bgc_c();
mModel.mBgc = JKR_NEW daDemo00_bgc_c();
if (mModel.mBgc == NULL) {
return 0;
}
@@ -406,7 +406,7 @@ int daDemo00_c::createHeap() {
JUT_ASSERT(687, mModel.mDeformData != NULL);
if (mModel.mID.field_0x20 != -1) {
mModel.mpBlkAnm = new mDoExt_blkAnm();
mModel.mpBlkAnm = JKR_NEW mDoExt_blkAnm();
if (mModel.mpBlkAnm == NULL) {
return 0;
}
src/d/actor/d_a_dmidna.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
static const char l_arcName[] = "Dmidna";
int daDmidna_c::createHeap() {
mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(l_arcName, 8), NULL,
mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(l_arcName, 8), NULL,
NULL, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4),
2, 1.0f, 0, -1, NULL, 0, 0);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
src/d/actor/d_a_do.cpp
+3 -3
View File
@@ -2356,7 +2356,7 @@ static int daDo_Delete(do_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
do_class* _this = (do_class*)i_this;
_this->mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Do", 25), NULL, NULL,
_this->mpMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Do", 25), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("Do", 14), 2,
1.0f, 0, -1, 1, NULL, 0x80000, 0x11020284);
@@ -2374,7 +2374,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
}
_this->mpBtk = new mDoExt_btkAnm();
_this->mpBtk = JKR_NEW mDoExt_btkAnm();
if (_this->mpBtk == NULL) {
return 0;
}
@@ -2386,7 +2386,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
_this->mpBtp = new mDoExt_btpAnm();
_this->mpBtp = JKR_NEW mDoExt_btpAnm();
if (_this->mpBtp == NULL) {
return 0;
}
src/d/actor/d_a_door_boss.cpp
+3 -3
View File
@@ -54,12 +54,12 @@ int daBdoor_c::CreateHeap() {
}
J3DAnmTransform* lock_bck = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "VlockB.bck");
mpLockAnm = new mDoExt_bckAnm();
mpLockAnm = JKR_NEW mDoExt_bckAnm();
if (mpLockAnm == NULL || !mpLockAnm->init(lock_bck, 1, 0, 1.0f, 0, -1, false)) {
return 0;
}
J3DSkinDeform* deform = new J3DSkinDeform();
J3DSkinDeform* deform = JKR_NEW J3DSkinDeform();
if (deform == NULL) {
return 0;
}
@@ -67,7 +67,7 @@ int daBdoor_c::CreateHeap() {
return 0;
}
mpBgW = new dBgW();
mpBgW = JKR_NEW dBgW();
cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(getArcName(), getDzb());
if (dzb == NULL) {
return 0;
src/d/actor/d_a_door_bossL1.cpp
+3 -3
View File
@@ -204,14 +204,14 @@ int daBdoorL1_c::CreateHeap() {
if (nowLevel == 8) {
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(getArcName(), "door_shutterBoss.btk");
JUT_ASSERT(341, pbtk != NULL);
field_0x58c = new mDoExt_btkAnm();
field_0x58c = JKR_NEW mDoExt_btkAnm();
if (field_0x58c == NULL || !field_0x58c->init(field_0x580->getModelData(), pbtk, 1, 0, 1.0f, 0, -1)) {
return 0;
}
}
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm());
JUT_ASSERT(354, anm != NULL);
field_0x588 = new mDoExt_bckAnm();
field_0x588 = JKR_NEW mDoExt_bckAnm();
if (field_0x588 == NULL || !field_0x588->init(anm, 1, 0, 1.0f, 0, -1,false)) {
return 0;
}
@@ -222,7 +222,7 @@ int daBdoorL1_c::CreateHeap() {
field_0x584->calc();
}
calcMtx();
field_0x590 = new dBgW();
field_0x590 = JKR_NEW dBgW();
if (field_0x590 == NULL || field_0x590->Set((cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb()), 1, &field_0x7ec)) {
return 0;
}
src/d/actor/d_a_door_bossL5.cpp
+2 -2
View File
@@ -81,7 +81,7 @@ int daBdoorL5_c::CreateHeap() {
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm());
JUT_ASSERT(354, anm != NULL);
field_0x584 = new mDoExt_bckAnm();
field_0x584 = JKR_NEW mDoExt_bckAnm();
if (field_0x584 == NULL || !field_0x584->init(anm, 1, 0, 1.0f, 0, -1, false)) {
return 0;
}
@@ -89,7 +89,7 @@ int daBdoorL5_c::CreateHeap() {
field_0x584->entry(field_0x580->getModelData());
field_0x580->calc();
calcMtx();
field_0x588 = new dBgW();
field_0x588 = JKR_NEW dBgW();
if (field_0x588 == NULL || field_0x588->Set((cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb()), 1, &field_0x580->getBaseTRMtx())) {
return 0;
}
src/d/actor/d_a_door_dbdoor00.cpp
+1 -1
View File
@@ -90,7 +90,7 @@ int daDbDoor00_c::CreateHeap() {
nodePointerR->setCallBack(nodeCallBack);
mpModel2->setUserArea((uintptr_t)this);
mpBgW = new dBgW();
mpBgW = JKR_NEW dBgW();
cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb());
if (dzb == NULL) {
return 0;
src/d/actor/d_a_door_knob00.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ int daKnob20_c::CreateHeap() {
if (mModel2 == 0) {
return 0;
}
field_0x5a0 = new dBgW();
field_0x5a0 = JKR_NEW dBgW();
if (field_0x5a0 == NULL) {
return 0;
}
src/d/actor/d_a_door_mbossL1.cpp
+4 -4
View File
@@ -303,7 +303,7 @@ int daMBdoorL1_c::CreateHeap() {
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(
getAlwaysArcName(), "FDoorA.bck");
JUT_ASSERT(597, anm != NULL);
mBckAnms[i] = new mDoExt_bckAnm();
mBckAnms[i] = JKR_NEW mDoExt_bckAnm();
if (mBckAnms[i] == NULL || !mBckAnms[i]->init(anm, 1, 0, 1.0f, 0, -1, false)) {
return 0;
}
@@ -324,7 +324,7 @@ int daMBdoorL1_c::CreateHeap() {
J3DAnmTransform* anm =
(J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm());
JUT_ASSERT(628, anm != NULL);
mBckAnms[0] = new mDoExt_bckAnm();
mBckAnms[0] = JKR_NEW mDoExt_bckAnm();
if (mBckAnms[0] == NULL || !mBckAnms[0]->init(anm, 1, 0, 1.0f, 0, -1, false)) {
return 0;
}
@@ -334,7 +334,7 @@ int daMBdoorL1_c::CreateHeap() {
if (level == 8) {
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getStageRes(getBtk());
JUT_ASSERT(646, pbtk != NULL);
field_0x594 = new mDoExt_btkAnm();
field_0x594 = JKR_NEW mDoExt_btkAnm();
if (field_0x594 == NULL ||
!field_0x594->init(mModels[0]->getModelData(), pbtk, 1, 0, 1.0f, 0, -1))
{
@@ -361,7 +361,7 @@ int daMBdoorL1_c::CreateHeap() {
mDoMtx_stack_c::scaleM(1.0f, 1.4f, 1.0f);
}
MTXCopy(mDoMtx_stack_c::get(), field_0x59c);
field_0x598 = new dBgW();
field_0x598 = JKR_NEW dBgW();
if (field_0x598 == NULL || field_0x598->Set((cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb()), 1, &field_0x59c)) {
return 0;
}
src/d/actor/d_a_door_push.cpp
+1 -1
View File
@@ -111,7 +111,7 @@ int daDoorPush_c::CreateHeap() {
return 0;
}
}
mpDoorBgW = new dBgW();
mpDoorBgW = JKR_NEW dBgW();
if (mpDoorBgW == NULL ||
mpDoorBgW->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, 8), 1, &mDoorMtx))
{
src/d/actor/d_a_door_shutter.cpp
+2 -2
View File
@@ -147,7 +147,7 @@ int daDoor20_c::CreateHeap() {
J3DAnmTextureSRTKey* pbtk;
pbtk = (J3DAnmTextureSRTKey*)dComIfG_getStageRes(getBtk());
JUT_ASSERT(421, pbtk != NULL);
field_0x5c0 = new mDoExt_btkAnm();
field_0x5c0 = JKR_NEW mDoExt_btkAnm();
if (field_0x5c0 == NULL ||
!field_0x5c0->init(mModel1->getModelData(), pbtk, 1, 0, 1.0f, 0, -1))
{
@@ -177,7 +177,7 @@ int daDoor20_c::CreateHeap() {
mDoMtx_stack_c::scaleM(1.0f, 1.4f, 1.0f);
}
MTXCopy(mDoMtx_stack_c::get(), field_0x5f4);
field_0x5c4 = new dBgW();
field_0x5c4 = JKR_NEW dBgW();
if (field_0x5c4 == 0 || field_0x5c4->Set((cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzbName()), 1, &field_0x5f4)) {
return 0;
}
src/d/actor/d_a_door_spiral.cpp
+3 -3
View File
@@ -218,7 +218,7 @@ int daSpiral_c::CreateHeap() {
return 0;
}
mpSpiralDzb = new dBgW();
mpSpiralDzb = JKR_NEW dBgW();
if (mpSpiralDzb == NULL) {
return 0;
}
@@ -230,7 +230,7 @@ int daSpiral_c::CreateHeap() {
return 0;
}
mDoorDarkDzb = new dBgW();
mDoorDarkDzb = JKR_NEW dBgW();
if (mDoorDarkDzb == NULL) {
return 0;
}
@@ -1048,7 +1048,7 @@ int dSpiral_stop_c::create(daSpiral_c* i_spiral) {
return 0;
}
mpBgw = new dBgW();
mpBgw = JKR_NEW dBgW();
if (mpBgw == NULL) {
return 0;
}
src/d/actor/d_a_e_ai.cpp
+2 -2
View File
@@ -861,12 +861,12 @@ int e_ai_class::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_AI", 0xD);
JUT_ASSERT(1703, modelData != NULL);
m_modelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_AI", 9), 2, 1.0f, 0, -1, &m_sound, 0, 0x11000084);
m_modelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_AI", 9), 2, 1.0f, 0, -1, &m_sound, 0, 0x11000084);
if (m_modelMorf == NULL || m_modelMorf->getModel() == NULL) {
return 0;
}
m_brk = new mDoExt_brkAnm();
m_brk = JKR_NEW mDoExt_brkAnm();
if (m_brk == NULL) {
return 0;
}
src/d/actor/d_a_e_ba.cpp
+1 -1
View File
@@ -978,7 +978,7 @@ static int daE_BA_Delete(e_ba_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
e_ba_class* _this = (e_ba_class*)i_this;
_this->mpMorf = new mDoExt_McaMorfSO(
_this->mpMorf = JKR_NEW mDoExt_McaMorfSO(
static_cast<J3DModelData*>(dComIfG_getObjectRes(_this->mArcName, 13)), NULL, NULL,
static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(_this->mArcName, 10)),
2, 1.0f, 0, -1, &_this->mCreatureSound, 0x80000, 0x11000084);
src/d/actor/d_a_e_bg.cpp
+2 -2
View File
@@ -1288,7 +1288,7 @@ int daE_BG_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_BG", 10);
JUT_ASSERT(0, modelData != NULL);
mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL,
mpMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_BG", 7), 0, 1.0f, 0,
-1, &mCreatureSound, 0x80000, 0x11000084);
if (mpMorfSO == NULL || mpMorfSO->getModel() == NULL) {
@@ -1303,7 +1303,7 @@ int daE_BG_c::CreateHeap() {
model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
}
mpBrkAnm = new mDoExt_brkAnm();
mpBrkAnm = JKR_NEW mDoExt_brkAnm();
if (mpBrkAnm == NULL) {
return 0;
}
src/d/actor/d_a_e_bi.cpp
+1 -1
View File
@@ -854,7 +854,7 @@ static int daE_BI_Delete(e_bi_class* i_this) {
static int useHeapInit(fopAc_ac_c* actor) {
e_bi_class* i_this = (e_bi_class*)actor;
i_this->anm_p = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_BI", BMDR_BI), NULL, NULL,
i_this->anm_p = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_BI", BMDR_BI), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_BI", BCK_BI_WAIT01), 2, 1.0f, 0, -1,
&i_this->sound, 0x80000, 0x11000084);
if (i_this->anm_p == NULL || i_this->anm_p->getModel() == NULL) {
src/d/actor/d_a_e_bs.cpp
+2 -2
View File
@@ -797,7 +797,7 @@ static int daE_BS_Delete(e_bs_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
e_bs_class* a_this = (e_bs_class*)i_this;
a_this->modelMorf = new mDoExt_McaMorfSO((J3DModelData* )dComIfG_getObjectRes("E_BS", 0xE), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_BS", 7), 0, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084);
a_this->modelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData* )dComIfG_getObjectRes("E_BS", 0xE), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_BS", 7), 0, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084);
if (a_this->modelMorf == NULL || a_this->modelMorf->getModel() == NULL) {
return 0;
}
@@ -811,7 +811,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
}
a_this->weponModelMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_BS", 0xF), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_BS", 0xA), 0, 1.0f, 0, -1, 1, 0, 0x80000, 0x11000084);
a_this->weponModelMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_BS", 0xF), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_BS", 0xA), 0, 1.0f, 0, -1, 1, 0, 0x80000, 0x11000084);
if (a_this->weponModelMorf == NULL || a_this->weponModelMorf->getModel() == NULL) {
return 0;
}
src/d/actor/d_a_e_bu.cpp
+1 -1
View File
@@ -1008,7 +1008,7 @@ static int daE_BU_Delete(e_bu_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
e_bu_class* a_this = (e_bu_class*)i_this;
a_this->modelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_BU", 11), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_BU", 7), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084);
a_this->modelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_BU", 11), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_BU", 7), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084);
if (a_this->modelMorf == NULL || a_this->modelMorf->getModel() == NULL) {
return 0;
}
src/d/actor/d_a_e_cr.cpp
+1 -1
View File
@@ -461,7 +461,7 @@ static int daE_CR_Delete(e_cr_class* a_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
e_cr_class* a_this = (e_cr_class*)i_this;
a_this->modelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_CR", 0xD), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_CR", 9), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084);
a_this->modelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_CR", 0xD), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_CR", 9), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084);
if (a_this->modelMorf == NULL || a_this->modelMorf->getModel() == NULL) {
return 0;
}
src/d/actor/d_a_e_db.cpp
+1 -1
View File
@@ -2033,7 +2033,7 @@ static int daE_DB_Delete(e_db_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
e_db_class* a_this = (e_db_class*)i_this;
a_this->modelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_db", 0x17), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_db", 0x12), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084);
a_this->modelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_db", 0x17), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_db", 0x12), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084);
if (a_this->modelMorf == NULL || a_this->modelMorf->getModel() == NULL) {
return 0;
}
src/d/actor/d_a_e_db_leaf.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ static int daE_DB_LEAF_Delete(e_db_leaf_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
e_db_leaf_class* leaf = static_cast<e_db_leaf_class*>(i_this);
leaf->mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_DB", 0x18), NULL, NULL,
leaf->mpMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_DB", 0x18), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_DB", 0x13), 2, 1.0, 0, -1, 1, NULL, 0x80000, 0x11000084);
if (leaf->mpMorf == NULL || leaf->mpMorf->getModel() == NULL) {
src/d/actor/d_a_e_dd.cpp
+2 -2
View File
@@ -1573,7 +1573,7 @@ static int daE_DD_Delete(e_dd_class* i_this) {
static int useHeapInit(fopAc_ac_c* a_this) {
e_dd_class* i_this = (e_dd_class*)a_this;
i_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_dd", BMDR_DD), NULL, NULL,
i_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_dd", BMDR_DD), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_dd", BCK_DD_WAIT), 2, 1.0f, 0, -1,
&i_this->mSound, 0x80000, 0x11020084);
if (i_this->mpModelMorf == NULL || i_this->mpModelMorf->getModel() == NULL) {
@@ -1593,7 +1593,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
};
for (int i = 0; i < 5; i++) {
i_this->mpBrkAnms[i] = new mDoExt_brkAnm();
i_this->mpBrkAnms[i] = JKR_NEW mDoExt_brkAnm();
if (i_this->mpBrkAnms[i] == NULL) {
return 0;
}
src/d/actor/d_a_e_df.cpp
+1 -1
View File
@@ -39,7 +39,7 @@ int daE_DF_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_DF", 0xD);
JUT_ASSERT(161, modelData != NULL);
mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL,
mpMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_DF", 10), 2, 1.0f, 0,
-1, &mCreatureSound, 0x80000, 0x11000084);
if (mpMorfSO == NULL || mpMorfSO->getModel() == NULL) {
src/d/actor/d_a_e_dk.cpp
+4 -4
View File
@@ -939,7 +939,7 @@ static int daE_DK_Delete(daE_DK_c* i_this) {
int daE_DK_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_DK", BMDR_DK);
JUT_ASSERT(1488, modelData != NULL);
mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL,
mpMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_DK", BCK_DK_WAIT), 0, 1.0f, 0,
-1, &mCreatureSound, 0x80000, 0x31000284);
@@ -948,7 +948,7 @@ int daE_DK_c::CreateHeap() {
}
for (s32 i = 0; i < 2; i++) {
mpBrkAnm[i] = new mDoExt_brkAnm();
mpBrkAnm[i] = JKR_NEW mDoExt_brkAnm();
if (mpBrkAnm[i] == 0) {
return 0;
}
@@ -960,7 +960,7 @@ int daE_DK_c::CreateHeap() {
return 0;
}
mpBtkAnm[i] = new mDoExt_btkAnm();
mpBtkAnm[i] = JKR_NEW mDoExt_btkAnm();
if (mpBtkAnm[i] == 0) {
return 0;
}
@@ -975,7 +975,7 @@ int daE_DK_c::CreateHeap() {
modelData = (J3DModelData*)dComIfG_getObjectRes("E_DK", BMDR_DK_CORE);
JUT_ASSERT(1537, modelData != NULL);
mpCoreMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL,
mpCoreMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_DK", BCK_DK_C_WAIT), 0,
1.0f, 0, -1, &mCreatureSound, 0x80000, 0x11000084);
src/d/actor/d_a_e_dn.cpp
+1 -1
View File
@@ -3312,7 +3312,7 @@ static dJntColData_c jc_data[12] = {
static int useHeapInit(fopAc_ac_c* actor) {
e_dn_class* i_this = (e_dn_class*)actor;
i_this->anm_p = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_dn", 38), NULL, NULL,
i_this->anm_p = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_dn", 38), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_dn", 31), 0, 1.0f,
0, -1, &i_this->sound, 0x80000, 0x11000084);
if (i_this->anm_p == NULL || i_this->anm_p->getModel() == NULL) {
src/d/actor/d_a_e_dt.cpp
+1 -1
View File
@@ -2414,7 +2414,7 @@ static int daE_DT_Delete(daE_DT_c* i_this) {
int daE_DT_c::CreateHeap() {
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("E_DT", 28);
mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL,
mpMorf = JKR_NEW mDoExt_McaMorfSO(model_data, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_DT", 23),
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1,
&mSound, 0, 0x11000084);
src/d/actor/d_a_e_fb.cpp
+2 -2
View File
@@ -870,7 +870,7 @@ static int daE_FB_Delete(daE_FB_c* i_this) {
int daE_FB_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes("E_FL", 0xB);
JUT_ASSERT(1516, modelData != NULL);
mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL,
mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_FL", 0x8),
0, 1.0f, 0, -1, &mCreatureSound, 0, 0x31000084);
if (mpMorf == NULL || mpMorf->getModel() == NULL) {
@@ -889,7 +889,7 @@ int daE_FB_c::CreateHeap() {
}
}
mpBrkAnm = new mDoExt_brkAnm();
mpBrkAnm = JKR_NEW mDoExt_brkAnm();
if (mpBrkAnm == NULL) {
return 0;
}
src/d/actor/d_a_e_fk.cpp
+1 -1
View File
@@ -37,7 +37,7 @@ daE_FK_HIO_c::daE_FK_HIO_c() {
int daE_FK_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_fk", 15);
JUT_ASSERT(189, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_fk", 12), 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_fk", 12), 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
return 0;
}
src/d/actor/d_a_e_fm.cpp
+10 -10
View File
@@ -3474,7 +3474,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
J3DModelData* modelData;
e_fm_class* a_this = (e_fm_class*)i_this;
a_this->mpFmModelMorf = new mDoExt_McaMorf(static_cast<J3DModelData*>(dComIfG_getObjectRes("E_fm", BMDR_FM)), NULL, NULL,
a_this->mpFmModelMorf = JKR_NEW mDoExt_McaMorf(static_cast<J3DModelData*>(dComIfG_getObjectRes("E_fm", BMDR_FM)), NULL, NULL,
static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("E_fm", BCK_FM_WAIT01)), 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284);
if (a_this->mpFmModelMorf == NULL || a_this->mpFmModelMorf->getModel() == NULL) {
return 0;
@@ -3491,7 +3491,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
int anm_mode;
for (int i = 0; i < 9; i++) {
a_this->mpFmBrk[i] = new mDoExt_brkAnm();
a_this->mpFmBrk[i] = JKR_NEW mDoExt_brkAnm();
if (a_this->mpFmBrk[i] == NULL) {
return 0;
}
@@ -3512,7 +3512,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
a_this->mpFmBtk[i] = new mDoExt_btkAnm();
a_this->mpFmBtk[i] = JKR_NEW mDoExt_btkAnm();
if (a_this->mpFmBtk[i] == NULL) {
return 0;
}
@@ -3528,13 +3528,13 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
}
a_this->mpDemoFmModelMorf = new mDoExt_McaMorf(static_cast<J3DModelData*>(dComIfG_getObjectRes("E_fm", BMDR_FM)), NULL, NULL,
a_this->mpDemoFmModelMorf = JKR_NEW mDoExt_McaMorf(static_cast<J3DModelData*>(dComIfG_getObjectRes("E_fm", BMDR_FM)), NULL, NULL,
static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("E_fm", BCK_FM_DEMOEND03)), 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284);
if (a_this->mpDemoFmModelMorf == NULL || a_this->mpDemoFmModelMorf->getModel() == NULL) {
return 0;
}
a_this->mpDemoFmBrk = new mDoExt_brkAnm();
a_this->mpDemoFmBrk = JKR_NEW mDoExt_brkAnm();
if (a_this->mpDemoFmBrk == NULL) {
return 0;
}
@@ -3552,7 +3552,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
a_this->mpCoreBrk = new mDoExt_brkAnm();
a_this->mpCoreBrk = JKR_NEW mDoExt_brkAnm();
if (a_this->mpCoreBrk == NULL) {
return 0;
}
@@ -3563,7 +3563,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
a_this->mpCoreBtk = new mDoExt_btkAnm();
a_this->mpCoreBtk = JKR_NEW mDoExt_btkAnm();
if (a_this->mpCoreBtk == NULL) {
return 0;
}
@@ -3578,13 +3578,13 @@ static int useHeapInit(fopAc_ac_c* i_this) {
for (int i = 0; i < 2; i++) {
static int eff_bmd[] = {BMDR_EF_FMATTACK_A, BMDR_EF_FMATTACK_B};
a_this->mpAttackEfModelMorf[i] = new mDoExt_McaMorf(static_cast<J3DModelData*>(dComIfG_getObjectRes("E_fm", eff_bmd[i])), NULL, NULL, NULL, 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284);
a_this->mpAttackEfModelMorf[i] = JKR_NEW mDoExt_McaMorf(static_cast<J3DModelData*>(dComIfG_getObjectRes("E_fm", eff_bmd[i])), NULL, NULL, NULL, 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284);
if (a_this->mpAttackEfModelMorf[i] == NULL || a_this->mpAttackEfModelMorf[i]->getModel() == NULL) {
return 0;
}
if (i != 0) {
a_this->mpAttackEfBrk = new mDoExt_brkAnm();
a_this->mpAttackEfBrk = JKR_NEW mDoExt_brkAnm();
if (a_this->mpAttackEfBrk == NULL) {
return 0;
}
@@ -3596,7 +3596,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
}
a_this->mpAttackEfBtk[i] = new mDoExt_btkAnm();
a_this->mpAttackEfBtk[i] = JKR_NEW mDoExt_btkAnm();
if (a_this->mpAttackEfBtk[i] == NULL) {
return 0;
}
src/d/actor/d_a_e_fs.cpp
+1 -1
View File
@@ -707,7 +707,7 @@ static int daE_Fs_Delete(e_fs_class* i_this) {
static int useHeapIe_fst(fopAc_ac_c* i_this) {
e_fs_class* _this = (e_fs_class*)i_this;
_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_FS", 0xc), NULL,
_this->mpMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_FS", 0xc), NULL,
NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_FS", 9),
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1,
&_this->mCreatureSound, 0x80000, 0x11000084);
src/d/actor/d_a_e_gb.cpp
+3 -3
View File
@@ -1563,14 +1563,14 @@ static int daE_GB_Delete(e_gb_class* i_this) {
static int useHeapInit(fopAc_ac_c* actor) {
e_gb_class* i_this = (e_gb_class*)actor;
i_this->anmP = new mDoExt_McaMorf(static_cast<J3DModelData*>(dComIfG_getObjectRes("E_gb", dRes_INDEX_E_GB_BMD_GB_e)), NULL, NULL,
i_this->anmP = JKR_NEW mDoExt_McaMorf(static_cast<J3DModelData*>(dComIfG_getObjectRes("E_gb", dRes_INDEX_E_GB_BMD_GB_e)), NULL, NULL,
static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("E_gb", dRes_INDEX_E_GB_BCK_GB_WAIT_e)), 2, 1.0f,
0, -1, 1, NULL, J3DMdlFlag_DifferedDLBuffer, 0x11000084);
if (i_this->anmP == NULL || i_this->anmP->getModel() == NULL) {
return 0;
}
i_this->flowerAnmP = new mDoExt_McaMorf(static_cast<J3DModelData*>(dComIfG_getObjectRes("E_gb", dRes_INDEX_E_GB_BMD_GF_e)), NULL, NULL,
i_this->flowerAnmP = JKR_NEW mDoExt_McaMorf(static_cast<J3DModelData*>(dComIfG_getObjectRes("E_gb", dRes_INDEX_E_GB_BMD_GF_e)), NULL, NULL,
static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("E_gb", dRes_INDEX_E_GB_BCK_GF_WAIT_CLOSE_e)), 2, 1.0f,
0, -1, 1, NULL, J3DMdlFlag_DifferedDLBuffer, 0x11000084);
i_this->bodyAnmNo = dRes_ID_E_GB_BCK_GF_WAIT_CLOSE_e;
@@ -1578,7 +1578,7 @@ static int useHeapInit(fopAc_ac_c* actor) {
return 0;
}
i_this->brkAnmP = new mDoExt_brkAnm();
i_this->brkAnmP = JKR_NEW mDoExt_brkAnm();
if (i_this->brkAnmP == NULL) {
return 0;
}
src/d/actor/d_a_e_ge.cpp
+1 -1
View File
@@ -1257,7 +1257,7 @@ static int daE_GE_Delete(daE_GE_c* i_this) {
}
int daE_GE_c::CreateHeap() {
mpMorfSO = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_GE", 0xF), NULL, NULL,
mpMorfSO = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_GE", 0xF), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_GE", 0xC), 0, 1.0f, 0,
-1, &mSound, 0x80000, 0x11000084);
src/d/actor/d_a_e_gi.cpp
+1 -1
View File
@@ -989,7 +989,7 @@ int daE_GI_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_GI", 0x13);
JUT_ASSERT(1621, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_GI", 0xB), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_GI", 0xB), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
return 0;
}
src/d/actor/d_a_e_gm.cpp
+2 -2
View File
@@ -1660,7 +1660,7 @@ int daE_GM_c::CreateHeap() {
JUT_ASSERT(2683, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mg", 9),
mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mg", 9),
0, 1.0f, 0, -1, &mSound, 0, 0x11000084);
} else {
if (mType != TYPE_NORMAL) {
@@ -1678,7 +1678,7 @@ int daE_GM_c::CreateHeap() {
JUT_ASSERT(2714, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_gm", BCK_GB_APPEAR),
mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_gm", BCK_GB_APPEAR),
0, 1.0f, 0, -1, &mSound, 0, 0x11000084);
}
src/d/actor/d_a_e_gob.cpp
+1 -1
View File
@@ -2244,7 +2244,7 @@ static int daE_GOB_Delete(e_gob_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
e_gob_class* a_this = (e_gob_class*)i_this;
a_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_gob", BMDR_MG), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_gob", BCK_MG_WAIT), 2, 1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11000084);
a_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_gob", BMDR_MG), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_gob", BCK_MG_WAIT), 2, 1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11000084);
if (a_this->mpModelMorf == NULL || a_this->mpModelMorf->getModel() == NULL) {
return 0;
}
src/d/actor/d_a_e_gs.cpp
+1 -1
View File
@@ -172,7 +172,7 @@ static int daE_GS_Delete(e_gs_class* a_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
e_gs_class* a_this = (e_gs_class*)i_this;
a_this->model_morf = new mDoExt_McaMorfSO((J3DModelData* )dComIfG_getObjectRes("E_gs", 9), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_gs", 6), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084);
a_this->model_morf = JKR_NEW mDoExt_McaMorfSO((J3DModelData* )dComIfG_getObjectRes("E_gs", 9), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_gs", 6), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084);
if (a_this->model_morf == NULL || a_this->model_morf->getModel() == NULL) {
return 0;
}
src/d/actor/d_a_e_hb.cpp
+1 -1
View File
@@ -1341,7 +1341,7 @@ static int daE_HB_Delete(e_hb_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
e_hb_class* a_this = (e_hb_class*)i_this;
a_this->modelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_hb", 0x17), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_hb", 0x12), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084);
a_this->modelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_hb", 0x17), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_hb", 0x12), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084);
if (a_this->modelMorf == NULL || a_this->modelMorf->getModel() == NULL) {
return 0;
}
src/d/actor/d_a_e_hb_leaf.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ static int daE_HB_LEAF_Delete(e_hb_leaf_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
e_hb_leaf_class* a_this = static_cast<e_hb_leaf_class*>(i_this);
a_this->mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_HB", 0x18), NULL,
a_this->mpMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_HB", 0x18), NULL,
NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_HB", 0x13),
2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084);
if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) {
src/d/actor/d_a_e_hm.cpp
+3 -3
View File
@@ -56,7 +56,7 @@ void daE_HM_HIO_c::genMessage(JORMContext* ctx) {
int daE_HM_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_HM", 17);
JUT_ASSERT(0xbf, modelData != NULL);
mAnm_p = new mDoExt_McaMorfSO(modelData, NULL, NULL,
mAnm_p = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_HM", 13), 2, 1.0f, 0, -1, &mSound,
0x80000, 0x11000284);
if (mAnm_p == NULL || mAnm_p->getModel() == NULL) {
@@ -65,7 +65,7 @@ int daE_HM_c::CreateHeap() {
J3DModel* model = mAnm_p->getModel();
mpBrkAnm = new mDoExt_brkAnm();
mpBrkAnm = JKR_NEW mDoExt_brkAnm();
if (mpBrkAnm == NULL) {
return 0;
}
@@ -74,7 +74,7 @@ int daE_HM_c::CreateHeap() {
return 0;
}
mpBtkAnm = new mDoExt_btkAnm();
mpBtkAnm = JKR_NEW mDoExt_btkAnm();
if (mpBtkAnm == NULL) {
return 0;
}
src/d/actor/d_a_e_hp.cpp
+2 -2
View File
@@ -1136,7 +1136,7 @@ static int daE_HP_Delete(daE_HP_c* i_this) {
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,
mpMorfSO = JKR_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) {
@@ -1173,7 +1173,7 @@ int daE_HP_c::CreateHeap() {
modelData = (J3DModelData*)dComIfG_getObjectRes("E_HP", 18);
mpMorf =
new mDoExt_McaMorf(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_HP", 4),
JKR_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) {
src/d/actor/d_a_e_hz.cpp
+2 -2
View File
@@ -1917,7 +1917,7 @@ int daE_HZ_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_HZ", dRes_INDEX_E_HZ_BMD_HZ_e);
JUT_ASSERT(2479, modelData != NULL);
mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL,
mpMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_HZ", dRes_INDEX_E_HZ_BCK_HZ_WAIT_e), 0, 1.0f,
0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, 0x11000084);
@@ -1938,7 +1938,7 @@ int daE_HZ_c::CreateHeap() {
return 0;
}
mpBgW = new dBgW();
mpBgW = JKR_NEW dBgW();
if (mpBgW == NULL) {
return 0;
}
src/d/actor/d_a_e_hzelda.cpp
+3 -3
View File
@@ -1311,7 +1311,7 @@ static int daE_HZELDA_Delete(e_hzelda_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
e_hzelda_class* a_this = (e_hzelda_class*)i_this;
a_this->mpModelMorf = new mDoExt_McaMorfSO(static_cast<J3DModelData*>(dComIfG_getObjectRes("Hzelda", 0x1B)), NULL, NULL,
a_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO(static_cast<J3DModelData*>(dComIfG_getObjectRes("Hzelda", 0x1B)), NULL, NULL,
static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Hzelda", 0x15)),
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11000284);
if (a_this->mpModelMorf == NULL || a_this->mpModelMorf->getModel() == NULL) {
@@ -1339,7 +1339,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
a_this->mpTriangleAtBrk = new mDoExt_brkAnm();
a_this->mpTriangleAtBrk = JKR_NEW mDoExt_brkAnm();
if (a_this->mpTriangleAtBrk == NULL) {
return 0;
}
@@ -1349,7 +1349,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
a_this->mpTriangleAtBtk = new mDoExt_btkAnm();
a_this->mpTriangleAtBtk = JKR_NEW mDoExt_btkAnm();
if (a_this->mpTriangleAtBtk == NULL) {
return 0;
}
src/d/actor/d_a_e_is.cpp
+1 -1
View File
@@ -619,7 +619,7 @@ static int daE_IS_Delete(e_is_class* a_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
e_is_class* a_this = (e_is_class*)i_this;
a_this->model_morf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_IS", 0x13), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_IS", 0xE), 2, 1.0f, 0, -1, &a_this->sound, 0, 0x11020203);
a_this->model_morf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_IS", 0x13), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_IS", 0xE), 2, 1.0f, 0, -1, &a_this->sound, 0, 0x11020203);
if (a_this->model_morf == NULL || a_this->model_morf->getModel() == NULL) {
return 0;
}
src/d/actor/d_a_e_kg.cpp
+2 -2
View File
@@ -656,14 +656,14 @@ static int daE_KG_Delete(e_kg_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
e_kg_class* a_this = (e_kg_class*) i_this;
a_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_kg", 0x12), NULL, NULL,
a_this->mpMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_kg", 0x12), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_kg", 0xE), 2, 1.0f, 0,
-1, &a_this->mSound, 0x80000, 0x11020084);
if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) {
return 0;
}
a_this->mpBtp = new mDoExt_btpAnm();
a_this->mpBtp = JKR_NEW mDoExt_btpAnm();
if (a_this->mpBtp == NULL) {
return cPhs_ERROR_e;
}
src/d/actor/d_a_e_kk.cpp
+2 -2
View File
@@ -1329,7 +1329,7 @@ int daE_KK_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_KK", 0x22);
JUT_ASSERT(2212, modelData != NULL);
mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL,
mpMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_KK", 0x19), 0,
1.0f, 0, -1, &mCreatureSound, 0, 0x31000084);
if (mpMorfSO == NULL || mpMorfSO->getModel() == NULL) {
@@ -1347,7 +1347,7 @@ int daE_KK_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_KK", 0x23);
JUT_ASSERT(2247, modelData != NULL);
mpWeaponMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL,
mpWeaponMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_KK", 0x1D), 0,
1.0f, 0, -1, &mCreatureSound, 0, 0x31000084);
if (mpWeaponMorfSO == NULL || mpWeaponMorfSO->getModel() == NULL) {
src/d/actor/d_a_e_kr.cpp
+1 -1
View File
@@ -2225,7 +2225,7 @@ static int daE_Kr_Delete(e_kr_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
e_kr_class* kr = (e_kr_class*)i_this;
kr->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_kr", 24), NULL, NULL,
kr->mpMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_kr", 24), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_kr", 13), 2, 1.0f,
0, -1, &((e_kr_class*)i_this)->mSound, 0x80000, 0x11000084);
if (kr->mpMorf == NULL || kr->mpMorf->getModel() == NULL) {
src/d/actor/d_a_e_mb.cpp
+4 -4
View File
@@ -638,12 +638,12 @@ static int daE_MB_Delete(e_mb_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
e_mb_class* a_this = (e_mb_class*)i_this;
a_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_mb", 0x19), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mb", 10), 0, 1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11020084);
a_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_mb", 0x19), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mb", 10), 0, 1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11020084);
if (a_this->mpModelMorf == NULL || a_this->mpModelMorf->getModel() == NULL) {
return 0;
}
a_this->mpBtp = new mDoExt_btpAnm();
a_this->mpBtp = JKR_NEW mDoExt_btpAnm();
if (a_this->mpBtp == NULL) {
return cPhs_ERROR_e;
}
@@ -653,12 +653,12 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return cPhs_ERROR_e;
}
a_this->mpBombModelMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_mb", 0x1B), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mb", 0x15), 0, 1.0f, 0, 1, 0, &a_this->mSound, 0x80000, 0x11000084);
a_this->mpBombModelMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_mb", 0x1B), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mb", 0x15), 0, 1.0f, 0, 1, 0, &a_this->mSound, 0x80000, 0x11000084);
if (a_this->mpBombModelMorf == NULL || a_this->mpBombModelMorf->getModel() == NULL) {
return 0;
}
a_this->mpBombModel2Morf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_mb", 0x1A), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mb", 0x14), 0, 1.0f, 0, 1, 0, &a_this->mSound, 0x80000, 0x11000084);
a_this->mpBombModel2Morf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_mb", 0x1A), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mb", 0x14), 0, 1.0f, 0, 1, 0, &a_this->mSound, 0x80000, 0x11000084);
if (a_this->mpBombModel2Morf == NULL || a_this->mpBombModel2Morf->getModel() == NULL) {
return 0;
}
src/d/actor/d_a_e_md.cpp
+3 -3
View File
@@ -68,20 +68,20 @@ int daE_MD_c::CreateHeap() {
JUT_ASSERT(180, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
return 0;
}
if (mType == TYPE_DUMMY) {
modelData = dComIfG_getObjectRes("E_MD", 0xD);
mpYariModelMorf = new mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, NULL, 0x80000, 0x11000084);
mpYariModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, NULL, 0x80000, 0x11000084);
if (mpYariModelMorf == NULL || mpYariModelMorf->getModel() == NULL) {
return 0;
}
} else if (mType == TYPE_LV9) {
modelData = dComIfG_getObjectRes("E_MD", 0xA);
mpYariModelMorf = new mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, NULL, 0x80000, 0x11000084);
mpYariModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, NULL, 0x80000, 0x11000084);
if (mpYariModelMorf == NULL || mpYariModelMorf->getModel() == NULL) {
return 0;
}
src/d/actor/d_a_e_mf.cpp
+1 -1
View File
@@ -3099,7 +3099,7 @@ static dJntColData_c jc_data[12] = {
static int useHeapInit(fopAc_ac_c* a_this) {
e_mf_class* i_this = (e_mf_class*)a_this;
i_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_mf", 38), NULL, NULL,
i_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_mf", 38), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_mf", 31), 0, 1.0f,
0, -1, &i_this->mSound, 0x80000, 0x11000084);
if (i_this->mpModelMorf == NULL || i_this->mpModelMorf->getModel() == NULL) {
src/d/actor/d_a_e_mk.cpp
+3 -3
View File
@@ -2791,14 +2791,14 @@ static int daE_MK_Delete(e_mk_class* i_this) {
static int useHeapInit(fopAc_ac_c* actor) {
e_mk_class* i_this = (e_mk_class*)actor;
i_this->anmP = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_mk", dRes_INDEX_E_MK_BMD_MK_e), NULL, NULL,
i_this->anmP = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_mk", dRes_INDEX_E_MK_BMD_MK_e), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_mk", dRes_INDEX_E_MK_BCK_MK_WAIT_e), 0, 1.0f,
0, -1, &i_this->sound, 0x80000, 0x11020084);
if (i_this->anmP == NULL || i_this->anmP->getModel() == NULL) {
return 0;
}
i_this->btpP = new mDoExt_btpAnm();
i_this->btpP = JKR_NEW mDoExt_btpAnm();
if (i_this->btpP == NULL) {
return 0;
}
@@ -2807,7 +2807,7 @@ static int useHeapInit(fopAc_ac_c* actor) {
return 0;
}
i_this->crownAnmP = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_mk", dRes_INDEX_E_MK_BMD_OK_e), NULL, NULL,
i_this->crownAnmP = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_mk", dRes_INDEX_E_MK_BMD_OK_e), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_mk", dRes_INDEX_E_MK_BCK_OK_DEFAULTPOSE_e), 0, 1.0f,
0, -1, 1, NULL, 0x80000, 0x11000084);
if (i_this->crownAnmP == NULL || i_this->crownAnmP->getModel() == NULL) {
src/d/actor/d_a_e_mk_bo.cpp
+2 -2
View File
@@ -736,12 +736,12 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
a_this->efModelMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_mk", 0x2F), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mk", 6), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284);
a_this->efModelMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_mk", 0x2F), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mk", 6), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284);
if (a_this->efModelMorf == NULL || a_this->efModelMorf->getModel() == NULL) {
return 0;
}
a_this->pbtk = new mDoExt_btkAnm();
a_this->pbtk = JKR_NEW mDoExt_btkAnm();
if (a_this->pbtk == NULL) {
return 0;
}
src/d/actor/d_a_e_mm.cpp
+1 -1
View File
@@ -1017,7 +1017,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
bmd_index = 0x12;
}
a_this->modelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_MM", bmd_index), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_MM", 0xD), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084);
a_this->modelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_MM", bmd_index), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_MM", 0xD), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084);
if (a_this->modelMorf == NULL || a_this->modelMorf->getModel() == NULL) {
return 0;
}
src/d/actor/d_a_e_ms.cpp
+1 -1
View File
@@ -961,7 +961,7 @@ static int daE_MS_Delete(e_ms_class* i_this) {
static int useHeapInit(fopAc_ac_c* actor) {
e_ms_class* i_this = (e_ms_class*)actor;
mDoExt_McaMorfSO* mMorf =
new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_MS", 20), NULL, NULL,
JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_MS", 20), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_MS", 16), 2, 1.0f, 0, -1,
&i_this->mSound, 0x80000, 0x11000084);
i_this->mpModelMorf = mMorf;
src/d/actor/d_a_e_nz.cpp
+1 -1
View File
@@ -663,7 +663,7 @@ static int daE_NZ_Delete(e_nz_class* i_this) {
static int useHeapInit(fopAc_ac_c* a_this) {
e_nz_class* i_this = (e_nz_class*)a_this;
i_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_NZ", 13), NULL,
i_this->mpMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_NZ", 13), NULL,
NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_NZ", 10),
2, 1.0f, 0, -1, &i_this->mSound, 0x80000, 0x11000084);
if (i_this->mpMorf == NULL || i_this->mpMorf->getModel() == NULL) {
src/d/actor/d_a_e_oc.cpp
+1 -1
View File
@@ -2638,7 +2638,7 @@ static void daE_OC_Delete(daE_OC_c* i_this) {
int daE_OC_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(mName, 0x3);
JUT_ASSERT(3443, modelData != NULL);
mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL,
mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_ocb", 0x1b),
0, 1.0f, 0, -1,
&mSound, 0x80000, 0x11000084);
src/d/actor/d_a_e_oct_bg.cpp
+2 -2
View File
@@ -764,7 +764,7 @@ int daE_OctBg_c::JointCallBack(J3DJoint* param_0, int param_1) {
int daE_OctBg_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_bg", 10);
JUT_ASSERT(1341, modelData != NULL);
field_0x5b4 = new mDoExt_McaMorfSO(
field_0x5b4 = JKR_NEW mDoExt_McaMorfSO(
modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_bg", 7), 0, 1.0f, 0, -1, &field_0x5bc,
0x80000, 0x11000084);
if (field_0x5b4 == NULL || field_0x5b4->getModel() == NULL) {
@@ -775,7 +775,7 @@ int daE_OctBg_c::CreateHeap() {
for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
}
field_0x5b8 = new mDoExt_brkAnm();
field_0x5b8 = JKR_NEW mDoExt_brkAnm();
if (field_0x5b8 == NULL) {
return 0;
}
src/d/actor/d_a_e_ot.cpp
+2 -2
View File
@@ -710,7 +710,7 @@ static int daE_OT_Delete(daE_OT_c* i_this) {
int daE_OT_c::CreateHeap() {
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("E_OT", 14);
mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL,
mpMorf = JKR_NEW mDoExt_McaMorfSO(model_data, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_OT", ANM_BORN),
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, &mSound,
0x80000, 0x11000084);
@@ -724,7 +724,7 @@ int daE_OT_c::CreateHeap() {
return 0;
}
mpEggAnm = new mDoExt_btkAnm();
mpEggAnm = JKR_NEW mDoExt_btkAnm();
if (mpEggAnm == NULL) {
return 0;
}
src/d/actor/d_a_e_ph.cpp
+1 -1
View File
@@ -159,7 +159,7 @@ int daE_PH_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_PH", PH_BMD);
JUT_ASSERT(0, modelData != NULL);
mpMorf = new mDoExt_McaMorfSO(
mpMorf = JKR_NEW mDoExt_McaMorfSO(
modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PH", ANM_WAIT),
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
if (mpMorf == NULL || mpMorf->getModel() == NULL) {
src/d/actor/d_a_e_pm.cpp
+5 -5
View File
@@ -174,7 +174,7 @@ int daE_PM_c::DemoSkipCallBack(void* i_this, int param_1) {
int daE_PM_c::CreateHeap() {
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("E_PM", 0x1d);
mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL,
mpMorf = JKR_NEW mDoExt_McaMorfSO(model_data, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_PM", 0x10),
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1,
&mCreatureSound, 0x80000, 0x11020084);
@@ -182,7 +182,7 @@ int daE_PM_c::CreateHeap() {
return 0;
}
mpEyeAnm = new mDoExt_btpAnm();
mpEyeAnm = JKR_NEW mDoExt_btpAnm();
if (mpEyeAnm == NULL) {
return 5;
}
@@ -198,7 +198,7 @@ int daE_PM_c::CreateHeap() {
return 0;
}
mpTrumpetMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_PM", 0x1f), NULL,
mpTrumpetMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_PM", 0x1f), NULL,
NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PM", 0x19),
J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, 1, NULL,
0x80000, 0x11000084);
@@ -206,7 +206,7 @@ int daE_PM_c::CreateHeap() {
return 0;
}
mpGlowEffectMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_PM", 0x1c), NULL,
mpGlowEffectMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_PM", 0x1c), NULL,
NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PM", 5),
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL,
0x80000, 0x11000084);
@@ -293,7 +293,7 @@ void daE_PM_c::SetAnm(int i_anm, int i_attr, f32 i_morf, f32 i_rate) {
}
static void dummy() {
delete (cM3dGPla*)NULL;
JKR_DELETE((cM3dGPla*)NULL);
}
static BOOL way_bg_check2(daE_PM_c* i_this, cXyz i_start, cXyz i_end) {
src/d/actor/d_a_e_po.cpp
+3 -3
View File
@@ -2841,7 +2841,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
e_po_class* a_this = (e_po_class*)i_this;
a_this->mpMorf =
new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_PO", 0x1B), NULL, NULL,
JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_PO", 0x1B), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_PO", 0x15), 2, 1.0f, 0, -1,
&a_this->mSound1, 0x80000, 0x11000084);
if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) {
@@ -2866,7 +2866,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
a_this->mpMorf3 =
new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_PO", 0x1D), NULL, NULL,
JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_PO", 0x1D), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_PO", 0x17), 0, 1.0f, 0, -1,
&a_this->mSound1, 0x80000, 0x11000084);
if (a_this->mpMorf3 == NULL || a_this->mpMorf3->getModel() == NULL) {
@@ -2878,7 +2878,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
a_this->mpMorf2 = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_PO", 0x1A), NULL,
a_this->mpMorf2 = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_PO", 0x1A), NULL,
NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PO", 0x4),
2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084);
if (a_this->mpMorf2 == NULL || a_this->mpMorf2->getModel() == NULL) {
src/d/actor/d_a_e_pz.cpp
+7 -7
View File
@@ -2392,7 +2392,7 @@ int daE_PZ_c::CreateHeap() {
return 0;
}
mpPortalBtk = new mDoExt_btkAnm();
mpPortalBtk = JKR_NEW mDoExt_btkAnm();
if (mpPortalBtk == NULL) {
return 0;
}
@@ -2402,7 +2402,7 @@ int daE_PZ_c::CreateHeap() {
}
for (int i = 0; i < 2; i++) {
mpPortalBrk[i] = new mDoExt_brkAnm();
mpPortalBrk[i] = JKR_NEW mDoExt_brkAnm();
if (mpPortalBrk[i] == NULL) {
return 0;
}
@@ -2415,13 +2415,13 @@ int daE_PZ_c::CreateHeap() {
modelData = (J3DModelData*)dComIfG_getObjectRes("E_PZ", 0x19);
JUT_ASSERT(3920, modelData != NULL);
mpBallModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PZ", 7), 2, 1.0f, 0, -1, NULL, 0, 0x11000084);
mpBallModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PZ", 7), 2, 1.0f, 0, -1, NULL, 0, 0x11000084);
if (mpBallModelMorf == NULL) {
return 0;
}
for (int i = 0; i < 2; i++) {
mpBallBrk = new mDoExt_brkAnm();
mpBallBrk = JKR_NEW mDoExt_brkAnm();
if (mpBallBrk == NULL) {
return 0;
}
@@ -2436,12 +2436,12 @@ int daE_PZ_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_PZ", 0x1C);
JUT_ASSERT(3959, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PZ", 8), 2, 1.0f, 0, -1, &field_0x5dc, 0, 0x11000284);
mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PZ", 8), 2, 1.0f, 0, -1, &field_0x5dc, 0, 0x11000284);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
return 0;
}
mpPzBrk = new mDoExt_brkAnm();
mpPzBrk = JKR_NEW mDoExt_brkAnm();
if (mpPzBrk == NULL) {
return 0;
}
@@ -2450,7 +2450,7 @@ int daE_PZ_c::CreateHeap() {
return 0;
}
mpPzBtk = new mDoExt_btkAnm();
mpPzBtk = JKR_NEW mDoExt_btkAnm();
if (mpPzBtk == NULL) {
return 0;
}
src/d/actor/d_a_e_rb.cpp
+1 -1
View File
@@ -756,7 +756,7 @@ static int daE_RB_Delete(e_rb_class* i_this) {
static int useHeapInit(fopAc_ac_c* i_this) {
e_rb_class* a_this = (e_rb_class*)i_this;
a_this->modelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_rb", 0xB), NULL, NULL, NULL, 0, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084);
a_this->modelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_rb", 0xB), NULL, NULL, NULL, 0, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084);
if (a_this->modelMorf == NULL || a_this->modelMorf->getModel() == NULL) {
return 0;
}

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