mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-27 17:02:55 -04:00
Fix JUT_ASSERT and several other macros (#2711)
* Fix JUT_ASSERT to be a nested define * Switch names that appear in asserts to be constants instead of defines * Replace `0` in asserts with `NULL` or `FALSE` * Fix fpclassify * Fix ARRAY_SIZE * Use G_CM3D_F_INF * More fixes for fpclassify * Remove FLOAT_LABEL * Remove incorrect FLAG_ON macro * Remove UNK_BSS macro * Silence clangd unused header warning for PCH
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_L7demo_dr.h"
|
||||
#include "d/actor/d_a_player.h"
|
||||
@@ -326,7 +326,7 @@ static int daDr_Delete(daDr_c* i_this) {
|
||||
/* 805AA084-805AA17C 000EC4 00F8+00 1/1 0/0 0/0 .text CreateHeap__6daDr_cFv */
|
||||
int daDr_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_dr", 0x49);
|
||||
JUT_ASSERT(655, modelData != 0);
|
||||
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);
|
||||
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_L7low_dr.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -136,7 +136,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
|
||||
/* 805AAC5C-805AAD58 0006DC 00FC+00 1/1 0/0 0/0 .text CreateHeap__11daL7lowDr_cFv */
|
||||
int daL7lowDr_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L7lowDr", 10);
|
||||
JUT_ASSERT(244, modelData != 0);
|
||||
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);
|
||||
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
|
||||
return 0;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_L7op_demo_dr.h"
|
||||
#include "d/actor/d_a_player.h"
|
||||
@@ -775,7 +775,7 @@ static int daL7ODR_Delete(daL7ODR_c* i_this) {
|
||||
/* 805AD90C-805ADA0C 0028EC 0100+00 1/1 0/0 0/0 .text CreateHeap__9daL7ODR_cFv */
|
||||
int daL7ODR_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_dr", 0x49);
|
||||
JUT_ASSERT(1146, modelData != 0);
|
||||
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);
|
||||
field_0x890 = 0x2F;
|
||||
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
|
||||
|
||||
+20
-20
@@ -3,7 +3,7 @@
|
||||
* Player (Link) Actor
|
||||
*/
|
||||
|
||||
#include "d/dolzel.h"
|
||||
#include "d/dolzel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_alink.h"
|
||||
#include "JSystem/J2DGraph/J2DAnmLoader.h"
|
||||
@@ -3698,11 +3698,11 @@ void daAlink_c::footBgCheck() {
|
||||
mLinkGndChk.SetPos(&sp44);
|
||||
|
||||
f32 temp_f1 = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
|
||||
if (-1000000000.0f != temp_f1) {
|
||||
if (-G_CM3D_F_INF != temp_f1) {
|
||||
dComIfG_Bgsp().GetTriPla(mLinkGndChk, &sp98);
|
||||
}
|
||||
|
||||
if (-1000000000.0f != temp_f1 && cBgW_CheckBGround(sp98.mNormal.y) && sp44.y - temp_f1 < l_autoUpHeight - l_autoDownHeight) {
|
||||
if (-G_CM3D_F_INF != temp_f1 && cBgW_CheckBGround(sp98.mNormal.y) && sp44.y - temp_f1 < l_autoUpHeight - l_autoDownHeight) {
|
||||
*sp24 = temp_f1;
|
||||
var_r29->field_0x0 = 1;
|
||||
sp20[i] = getGroundAngle(&mLinkGndChk, shape_angle.y);
|
||||
@@ -3820,7 +3820,7 @@ void daAlink_c::handBgCheck() {
|
||||
mLinkGndChk.SetPos(&sp28);
|
||||
|
||||
f32 temp_f1 = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
|
||||
if (-1000000000.0f != temp_f1 && (sp28.y - temp_f1 < l_autoUpHeight - l_autoDownHeight)) {
|
||||
if (-G_CM3D_F_INF != temp_f1 && (sp28.y - temp_f1 < l_autoUpHeight - l_autoDownHeight)) {
|
||||
*var_r25 = temp_f1;
|
||||
|
||||
if (dComIfG_Bgsp().GetGroundCode(mLinkGndChk) != 8) {
|
||||
@@ -4362,7 +4362,7 @@ void daAlink_c::playerInit() {
|
||||
m_mSwordBrk->searchUpdateMaterialID(modelData2);
|
||||
modelData2->entryTevRegAnimator(m_mSwordBrk);
|
||||
|
||||
f32 tmp = -1000000000.0f;
|
||||
f32 tmp = -G_CM3D_F_INF;
|
||||
mWaterY = tmp;
|
||||
field_0x33b8 = tmp;
|
||||
field_0x33bc = tmp;
|
||||
@@ -4737,7 +4737,7 @@ int daAlink_c::create() {
|
||||
mLinkAcch.CrrPos(dComIfG_Bgsp());
|
||||
void* var_r24 = NULL;
|
||||
|
||||
if (mLinkAcch.GetGroundH() == -1000000000.0f ||
|
||||
if (mLinkAcch.GetGroundH() == -G_CM3D_F_INF ||
|
||||
(startMode == 14 && !dComIfG_Bgsp().ChkMoveBG(mLinkAcch.m_gnd)) ||
|
||||
(startPoint == -4 &&
|
||||
!(var_r24 = fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchPortal, ¤t.pos))) ||
|
||||
@@ -4917,7 +4917,7 @@ void daAlink_c::setShapeAngleOnGround() {
|
||||
|
||||
sp20.y = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
|
||||
bool var_r29;
|
||||
if (-1000000000.0f != sp20.y) {
|
||||
if (-G_CM3D_F_INF != sp20.y) {
|
||||
var_r29 = dComIfG_Bgsp().GetTriPla(mLinkGndChk, &sp2C);
|
||||
} else {
|
||||
var_r29 = 0;
|
||||
@@ -4934,7 +4934,7 @@ void daAlink_c::setShapeAngleOnGround() {
|
||||
|
||||
sp14.y = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
|
||||
bool var_r29_2;
|
||||
if (-1000000000.0f != sp14.y) {
|
||||
if (-G_CM3D_F_INF != sp14.y) {
|
||||
var_r29_2 = dComIfG_Bgsp().GetTriPla(mLinkGndChk, &sp2C);
|
||||
} else {
|
||||
var_r29_2 = 0;
|
||||
@@ -6782,7 +6782,7 @@ int daAlink_c::setDoubleAnime(f32 i_blendRate, f32 i_anmSpeedA, f32 i_anmSpeedB,
|
||||
if (checkWolf()) {
|
||||
// "Player is Wolf, but setting Link animation\n"
|
||||
OSReport("狼なのにリンクアニメ設定\n");
|
||||
JUT_ASSERT(8591, 0);
|
||||
JUT_ASSERT(8591, FALSE);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -8602,13 +8602,13 @@ void daAlink_c::setFrontWallType() {
|
||||
mLinkGndChk.SetPos(&chk_start_pos);
|
||||
f32 sp38 = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
|
||||
|
||||
if (-1000000000.0f != sp38 && fabsf(sp1C - sp38) < l_autoUpHeight) {
|
||||
if (-G_CM3D_F_INF != sp38 && fabsf(sp1C - sp38) < l_autoUpHeight) {
|
||||
found_gnd_tri = dComIfG_Bgsp().GetTriPla(mLinkGndChk, &gndchk_tri);
|
||||
}
|
||||
if ((!checkModeFlg(0x40000) && sp38 < body_height) || !found_gnd_tri) {
|
||||
return;
|
||||
}
|
||||
if (-1000000000.0f == sp38 || !cBgW_CheckBGround(gndchk_tri.mNormal.y)) {
|
||||
if (-G_CM3D_F_INF == sp38 || !cBgW_CheckBGround(gndchk_tri.mNormal.y)) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -8687,7 +8687,7 @@ void daAlink_c::setWaterY() {
|
||||
} else {
|
||||
offNoResetFlg0(FLG0_UNK_80);
|
||||
field_0x2fbc = 16;
|
||||
mWaterY = -1000000000.0f;
|
||||
mWaterY = -G_CM3D_F_INF;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8737,7 +8737,7 @@ void daAlink_c::setHangWaterY() {
|
||||
checkWaterInKandelaar(field_0x33b8);
|
||||
}
|
||||
} else {
|
||||
field_0x33b8 = -1000000000.0f;
|
||||
field_0x33b8 = -G_CM3D_F_INF;
|
||||
field_0x2fc5 = 0x10;
|
||||
field_0x2fc6 = 0;
|
||||
}
|
||||
@@ -13176,7 +13176,7 @@ void daAlink_c::autoGroundHit() {
|
||||
}
|
||||
|
||||
BOOL var_r28;
|
||||
if (-1000000000.0f != mLinkAcch.GetGroundH()) {
|
||||
if (-G_CM3D_F_INF != mLinkAcch.GetGroundH()) {
|
||||
dComIfG_Bgsp().GetTriPla(mLinkAcch.m_gnd, &sp74);
|
||||
var_r28 = cBgW_CheckBGround(sp74.mNormal.y);
|
||||
} else {
|
||||
@@ -13384,7 +13384,7 @@ BOOL daAlink_c::checkRestartRoom() {
|
||||
return procCoLavaReturnInit(1);
|
||||
} else if ((checkModeFlg(0x40000) || (checkNoResetFlg0(FLG0_UNK_80) && mWaterY - current.pos.y > daAlinkHIO_swim_c0::m.mInitHeight)) && fopAcM_GetRoomNo(this) == 0 && checkStageName("F_SP114")) {
|
||||
return procCoSwimFreezeReturnInit();
|
||||
} else if (!checkCargoCarry() && (field_0x3174 == 4 || field_0x3174 == 10 || (-1000000000.0f == mLinkAcch.GetGroundH() && !checkModeFlg(0x40000)))) {
|
||||
} else if (!checkCargoCarry() && (field_0x3174 == 4 || field_0x3174 == 10 || (-G_CM3D_F_INF == mLinkAcch.GetGroundH() && !checkModeFlg(0x40000)))) {
|
||||
BOOL temp_r28 = mWaterY > mLinkAcch.GetGroundH();
|
||||
|
||||
f32 var_f31;
|
||||
@@ -13452,7 +13452,7 @@ BOOL daAlink_c::checkRestartRoom() {
|
||||
|
||||
return true;
|
||||
}
|
||||
} else if ((mLinkAcch.ChkGroundHit() && (dKy_pol_argument_get(&mLinkAcch.m_gnd) & 0x80)) || (checkWaterPolygonUnder() && checkNoResetFlg0(FLG0_UNK_80) && (dKy_pol_argument_get(&mLinkAcch.m_wtr) & 0x80)) || (checkModeFlg(0x40) && field_0x33bc < field_0x33b8 && -1000000000.0f != field_0x33b8 && (field_0x2fc6 & 0x80)) || (field_0x2fbc == 6 && checkNoResetFlg0(FLG0_UNK_80) && checkWaterPolygonUnder() && mWaterY > (daAlinkHIO_basic_c0::m.mLavaDeathDepth + mLinkAcch.GetGroundH())) || (field_0x2fc5 == 6 && -1000000000.0f != field_0x33b8 && field_0x33bc < field_0x33b8 && checkModeFlg(0x40) && field_0x33b8 > (field_0x33d8 + daAlinkHIO_basic_c0::m.mLavaDeathDepth))) {
|
||||
} else if ((mLinkAcch.ChkGroundHit() && (dKy_pol_argument_get(&mLinkAcch.m_gnd) & 0x80)) || (checkWaterPolygonUnder() && checkNoResetFlg0(FLG0_UNK_80) && (dKy_pol_argument_get(&mLinkAcch.m_wtr) & 0x80)) || (checkModeFlg(0x40) && field_0x33bc < field_0x33b8 && -G_CM3D_F_INF != field_0x33b8 && (field_0x2fc6 & 0x80)) || (field_0x2fbc == 6 && checkNoResetFlg0(FLG0_UNK_80) && checkWaterPolygonUnder() && mWaterY > (daAlinkHIO_basic_c0::m.mLavaDeathDepth + mLinkAcch.GetGroundH())) || (field_0x2fc5 == 6 && -G_CM3D_F_INF != field_0x33b8 && field_0x33bc < field_0x33b8 && checkModeFlg(0x40) && field_0x33b8 > (field_0x33d8 + daAlinkHIO_basic_c0::m.mLavaDeathDepth))) {
|
||||
if (field_0x2fbc == 6 || (checkModeFlg(0x40) && field_0x2fc5 == 6)) {
|
||||
return procCoLavaReturnInit(0);
|
||||
}
|
||||
@@ -17227,7 +17227,7 @@ int daAlink_c::procCoMetamorphoseInit() {
|
||||
mLinkGndChk.SetPos(&pos);
|
||||
|
||||
f32 gnd_cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
|
||||
if (gnd_cross != -1000000000.0f) {
|
||||
if (gnd_cross != -G_CM3D_F_INF) {
|
||||
pos.y = gnd_cross;
|
||||
|
||||
cXyz sp14 = current.pos;
|
||||
@@ -17624,7 +17624,7 @@ int daAlink_c::execute() {
|
||||
}
|
||||
}
|
||||
} else if (mProcID != PROC_HOOKSHOT_FLY && !checkModeFlg(MODE_VINE_CLIMB | MODE_UNK_800) &&
|
||||
mProcID != PROC_TOOL_DEMO && mLinkAcch.GetGroundH() != -1000000000.0f &&
|
||||
mProcID != PROC_TOOL_DEMO && mLinkAcch.GetGroundH() != -G_CM3D_F_INF &&
|
||||
dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd) &&
|
||||
dComIfG_Bgsp().ChkMoveBG(mLinkAcch.m_gnd))
|
||||
{
|
||||
@@ -18013,7 +18013,7 @@ int daAlink_c::execute() {
|
||||
speed.y = 0.0f;
|
||||
|
||||
if (field_0x3198 != 0) {
|
||||
if (mLinkAcch.GetGroundH() != -1000000000.0f) {
|
||||
if (mLinkAcch.GetGroundH() != -G_CM3D_F_INF) {
|
||||
current.pos.y = mLinkAcch.GetGroundH();
|
||||
}
|
||||
}
|
||||
@@ -18037,7 +18037,7 @@ int daAlink_c::execute() {
|
||||
|
||||
field_0x3178 = field_0x3174;
|
||||
|
||||
if (mLinkAcch.GetGroundH() != -1000000000.0f) {
|
||||
if (mLinkAcch.GetGroundH() != -G_CM3D_F_INF) {
|
||||
setRoomInfo();
|
||||
|
||||
if (!checkModeFlg(MODE_PLAYER_FLY) && !checkMagneBootsOn() && mProcID != PROC_TOOL_DEMO &&
|
||||
|
||||
@@ -70,14 +70,14 @@ void daAlink_c::setBottleModel(u16 i_itemNo) {
|
||||
J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(0x1E8, 0xC00);
|
||||
mpHookTipModel = initModel(loadAramBmd(0x31D, 0x1400), 0);
|
||||
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
|
||||
JUT_ASSERT(142, 0);
|
||||
JUT_ASSERT(142, FALSE);
|
||||
}
|
||||
mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f);
|
||||
} else if (i_itemNo == fpcNm_ITEM_WORM) {
|
||||
J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(0x1E9, 0xC00);
|
||||
mpHookTipModel = initModel(loadAramBmd(0x31E, 0x2400), 0);
|
||||
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
|
||||
JUT_ASSERT(151, 0);
|
||||
JUT_ASSERT(151, FALSE);
|
||||
}
|
||||
mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f);
|
||||
} else if (i_itemNo == fpcNm_ITEM_BEE_CHILD) {
|
||||
|
||||
@@ -308,7 +308,7 @@ int daAlink_c::checkPolyDamage() {
|
||||
}
|
||||
}
|
||||
|
||||
if (!checkBoardRide() && ((checkWaterPolygonUnder() && dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_wtr) && ((dKy_pol_argument_get(&mLinkAcch.m_wtr) & 0x60) || field_0x2fbc == 6)) || (checkModeFlg(0x40) && field_0x33bc < field_0x33b8 && -1000000000.0f != field_0x33b8 && ((field_0x2fc6 & 0x60) || field_0x2fc5 == 6) && (field_0x2fc5 != 6 || !(field_0x33b8 > field_0x33d8 + daAlinkHIO_basic_c0::m.mLavaDeathDepth))))) {
|
||||
if (!checkBoardRide() && ((checkWaterPolygonUnder() && dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_wtr) && ((dKy_pol_argument_get(&mLinkAcch.m_wtr) & 0x60) || field_0x2fbc == 6)) || (checkModeFlg(0x40) && field_0x33bc < field_0x33b8 && -G_CM3D_F_INF != field_0x33b8 && ((field_0x2fc6 & 0x60) || field_0x2fc5 == 6) && (field_0x2fc5 != 6 || !(field_0x33b8 > field_0x33d8 + daAlinkHIO_basic_c0::m.mLavaDeathDepth))))) {
|
||||
return 2;
|
||||
}
|
||||
|
||||
|
||||
@@ -1297,7 +1297,7 @@ BOOL daAlink_c::checkDeadAction(int param_0) {
|
||||
offCargoCarry();
|
||||
|
||||
int var_r29;
|
||||
if (dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd) && -1000000000.0f != mLinkAcch.GetGroundH()) {
|
||||
if (dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd) && -G_CM3D_F_INF != mLinkAcch.GetGroundH()) {
|
||||
var_r29 = dComIfG_Bgsp().GetExitId(mLinkAcch.m_gnd);
|
||||
} else {
|
||||
var_r29 = 0x3F;
|
||||
@@ -1605,7 +1605,7 @@ int daAlink_c::procCoToolDemo() {
|
||||
}
|
||||
}
|
||||
} else if (sp1C == 1) {
|
||||
JUT_ASSERT(2345, 0);
|
||||
JUT_ASSERT(2345, FALSE);
|
||||
} else if (sp1C == 2) {
|
||||
if (sp18 == 1) {
|
||||
if (sp14 == 2) {
|
||||
@@ -2216,7 +2216,7 @@ int daAlink_c::procCoGetItem() {
|
||||
// "Get Item is not an item!!! %d\n"
|
||||
OSReport("ゲットするアイテムがアイテムじゃない!!! %d\n",
|
||||
fopAcM_GetName(item_partner_p));
|
||||
JUT_ASSERT(3415, 0);
|
||||
JUT_ASSERT(3415, FALSE);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -3733,7 +3733,7 @@ int daAlink_c::procNotUseItem() {
|
||||
// "Present Item is not this Item!!! %d\n"
|
||||
OSReport("差し出すアイテムがアイテムじゃない!!! %d\n",
|
||||
fopAcM_GetName(item_partner_p));
|
||||
JUT_ASSERT(5506, 0);
|
||||
JUT_ASSERT(5506, FALSE);
|
||||
}
|
||||
#endif
|
||||
if (item_partner_p != NULL) {
|
||||
|
||||
@@ -354,7 +354,7 @@ int daAlink_c::procHangFallStartInit(cM3dGPla* param_0) {
|
||||
|
||||
f32 cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
|
||||
sp58.y = cross;
|
||||
if (sp58.y != -1000000000.0f) {
|
||||
if (sp58.y != -G_CM3D_F_INF) {
|
||||
if (sp58.y < current.pos.y + l_autoDownHeight) {
|
||||
return 0;
|
||||
}
|
||||
@@ -1986,7 +1986,7 @@ int daAlink_c::checkClimbGround(cXyz* param_0, f32 param_1) {
|
||||
mLinkGndChk.SetPos(param_0);
|
||||
|
||||
f32 cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
|
||||
if (cross != -1000000000.0f && dBgS_CheckBGroundPoly(mLinkGndChk) &&
|
||||
if (cross != -G_CM3D_F_INF && dBgS_CheckBGroundPoly(mLinkGndChk) &&
|
||||
cross >= param_1 - 50.0f)
|
||||
{
|
||||
param_0->y = cross;
|
||||
|
||||
@@ -278,7 +278,7 @@ void daAlink_c::initStatusWindow() {
|
||||
|
||||
J3DAnmTransform* bck = (J3DAnmTransform*)J3DAnmLoaderDataBase::load(tmpBuffer, J3DLOADER_UNK_FLAG0);
|
||||
if (!m_sWindowBck->init(bck, 1, 2, 1.0f, 0, -1, false)) {
|
||||
JUT_ASSERT(0x1B1, 0);
|
||||
JUT_ASSERT(433, FALSE);
|
||||
}
|
||||
|
||||
tmpBuffer = new (0x20) void*[0x100];
|
||||
|
||||
@@ -168,7 +168,7 @@ int daAlink_c::procGrassWhistleWaitInit(int param_0, int param_1, int param_2, s
|
||||
mLinkGndChk.SetPos(param_4);
|
||||
|
||||
f32 gnd_cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
|
||||
if (gnd_cross != -1000000000.0f) {
|
||||
if (gnd_cross != -G_CM3D_F_INF) {
|
||||
current.pos.set(param_4->x, gnd_cross, param_4->z);
|
||||
}
|
||||
|
||||
|
||||
@@ -1225,7 +1225,7 @@ int daAlink_c::setDoubleAnimeWolf(f32 param_0, f32 param_1, f32 param_2,
|
||||
if (!checkWolf()) {
|
||||
// "Is Adult Link but setting Wolf animation\n"
|
||||
OS_REPORT("リンクなのに狼アニメ設定\n");
|
||||
JUT_ASSERT(0x82B, 0);
|
||||
JUT_ASSERT(2091, FALSE);
|
||||
}
|
||||
|
||||
J3DAnmTransform* var_r25 = getNowAnmPackUnder(UNDER_0);
|
||||
@@ -1303,7 +1303,7 @@ int daAlink_c::setSingleAnimeWolf(daAlink_c::daAlink_WANM i_anmID, f32 i_speed,
|
||||
if (!checkWolf()) {
|
||||
// "Is Adult Link but setting Wolf animation\n"
|
||||
OS_REPORT("リンクなのに狼アニメ設定\n");
|
||||
JUT_ASSERT(0x82B, 0);
|
||||
JUT_ASSERT(2091, FALSE);
|
||||
}
|
||||
|
||||
J3DAnmTransform* var_r30 = getAnimeResource(&mUnderAnmHeap[0], m_wlAnmDataTable[i_anmID].field_0x0, 0x10800);
|
||||
@@ -2036,7 +2036,7 @@ void daAlink_c::wolfFootBgCheck() {
|
||||
temp_f31 = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
|
||||
temp_f30 = var_r26->y - temp_f31;
|
||||
|
||||
if (-1000000000.0f != temp_f31 && temp_f30 < temp_f27 && temp_f30 > sp1C) {
|
||||
if (-G_CM3D_F_INF != temp_f31 && temp_f30 < temp_f27 && temp_f30 > sp1C) {
|
||||
*sp20 = temp_f31;
|
||||
var_r28->field_0x0 = 1;
|
||||
sp48[i][j] = getGroundAngle(&mLinkGndChk, shape_angle.y);
|
||||
@@ -2144,11 +2144,11 @@ void daAlink_c::wolfFootBgCheck() {
|
||||
}
|
||||
|
||||
int sp18;
|
||||
if (-1000000000.0f != temp_f31) {
|
||||
if (-G_CM3D_F_INF != temp_f31) {
|
||||
sp18 = dComIfG_Bgsp().GetPolyAtt0(mLinkGndChk);
|
||||
}
|
||||
|
||||
if (-1000000000.0f == temp_f31 || sp18 == 3 || sp18 == 0xD) {
|
||||
if (-G_CM3D_F_INF == temp_f31 || sp18 == 3 || sp18 == 0xD) {
|
||||
sp90.y += mSinkShapeOffset;
|
||||
}
|
||||
|
||||
@@ -2161,11 +2161,11 @@ void daAlink_c::wolfFootBgCheck() {
|
||||
sp84.y = current.pos.y;
|
||||
}
|
||||
|
||||
if (-1000000000.0f != temp_f31) {
|
||||
if (-G_CM3D_F_INF != temp_f31) {
|
||||
sp18 = dComIfG_Bgsp().GetPolyAtt0(mLinkGndChk);
|
||||
}
|
||||
|
||||
if (-1000000000.0f == temp_f31 || sp18 == 3 || sp18 == 0xD) {
|
||||
if (-G_CM3D_F_INF == temp_f31 || sp18 == 3 || sp18 == 0xD) {
|
||||
sp84.y += mSinkShapeOffset;
|
||||
}
|
||||
|
||||
@@ -5695,7 +5695,7 @@ int daAlink_c::procWolfHangFallStartInit(cM3dGPla* param_0) {
|
||||
mLinkGndChk.SetPos(&gnd_chk_pos);
|
||||
gnd_chk_pos.y = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
|
||||
|
||||
if (gnd_chk_pos.y != -1000000000.0f) {
|
||||
if (gnd_chk_pos.y != -G_CM3D_F_INF) {
|
||||
if (gnd_chk_pos.y < current.pos.y + l_autoDownHeight) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Activates a switch when all enemies are defeated
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_alldie.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* AND - Switch
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_andsw.h"
|
||||
#include "d/d_procname.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_andsw2.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_arrow.h"
|
||||
#include "JSystem/J3DGraphBase/J3DMaterial.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_bh.h"
|
||||
#include "d/actor/d_a_b_bq.h"
|
||||
@@ -1462,7 +1462,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
|
||||
}
|
||||
|
||||
void* modelData = dComIfG_getObjectRes("B_BH", BMDR_BH_KUKI);
|
||||
JUT_ASSERT(2475, modelData != 0);
|
||||
JUT_ASSERT(2475, modelData != NULL);
|
||||
|
||||
for (int i = 0; i < 17; i++) {
|
||||
a_this->mpStemModels[i] = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084);
|
||||
@@ -1474,7 +1474,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
|
||||
}
|
||||
|
||||
modelData = dComIfG_getObjectRes("B_BH", BMDR_BH_LEAF);
|
||||
JUT_ASSERT(2491, modelData != 0);
|
||||
JUT_ASSERT(2491, modelData != NULL);
|
||||
|
||||
for (int i = 0; i < 17; i++) {
|
||||
if ((i & 3) == 2) {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Boss Baba (Diababa)
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_bq.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -2490,7 +2490,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
|
||||
}
|
||||
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_bq", BMDR_BQ_EYEBALL);
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
JUT_ASSERT(0, modelData != NULL);
|
||||
|
||||
a_this->mpEyeballModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (a_this->mpEyeballModel == NULL) {
|
||||
|
||||
+13
-13
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_dr.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -1115,7 +1115,7 @@ bool daB_DR_c::flapMove(bool param_0) {
|
||||
}
|
||||
}
|
||||
|
||||
if (-1000000000.0f == mAcch.GetGroundH()) {
|
||||
if (-G_CM3D_F_INF == mAcch.GetGroundH()) {
|
||||
target_y += home.pos.y;
|
||||
} else {
|
||||
target_y += mAcch.GetGroundH();
|
||||
@@ -1195,7 +1195,7 @@ bool daB_DR_c::mPlayerHighCheck() {
|
||||
gndchk.SetPos(&chk_pos);
|
||||
field_0x734 = dComIfG_Bgsp().GroundCross(&gndchk);
|
||||
|
||||
if (-1000000000.0f == field_0x734 || field_0x734 < 0.0f) {
|
||||
if (-G_CM3D_F_INF == field_0x734 || field_0x734 < 0.0f) {
|
||||
field_0x734 = home.pos.y;
|
||||
}
|
||||
|
||||
@@ -1217,7 +1217,7 @@ bool daB_DR_c::mBgFallGroundCheck() {
|
||||
chkpos.y += 300.0f;
|
||||
gndchk.SetPos(&chkpos);
|
||||
chkpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
|
||||
if (-1000000000.0f == chkpos.y) {
|
||||
if (-G_CM3D_F_INF == chkpos.y) {
|
||||
chkpos.y = home.pos.y;
|
||||
}
|
||||
if (chkpos.y < home.pos.y) {
|
||||
@@ -2728,7 +2728,7 @@ void daB_DR_c::executeGliderAttack() {
|
||||
field_0x7dc = 1;
|
||||
}
|
||||
|
||||
if (-1000000000.0f != mAcch.GetGroundH()) {
|
||||
if (-G_CM3D_F_INF != mAcch.GetGroundH()) {
|
||||
if (mAnm == ANM_DR_WIND_ATTACKB) {
|
||||
mCount[1]++;
|
||||
if (mCount[1] > WREG_S(9)) {
|
||||
@@ -2945,7 +2945,7 @@ void daB_DR_c::executePillarSearch() {
|
||||
cLib_addCalcAngleS2(¤t.angle.x, sp30.atan2sY_XZ(), 20, NREG_S(3) + 0x400);
|
||||
cLib_addCalcAngleS2(&shape_angle.x, current.angle.x, NREG_S(2) + 20, NREG_S(3) + 0x400);
|
||||
|
||||
if (mPlayerHighCheck() && -1000000000.0f != mAcch.GetGroundH()) {
|
||||
if (mPlayerHighCheck() && -G_CM3D_F_INF != mAcch.GetGroundH()) {
|
||||
setActionMode(ACTION_BREATH_ATTACK, 0);
|
||||
}
|
||||
}
|
||||
@@ -3571,7 +3571,7 @@ void daB_DR_c::action() {
|
||||
if (abs(temp_r28) < 0x2000) {
|
||||
field_0x74e = temp_r28;
|
||||
}
|
||||
if (mAnm == ANM_DR_WIND_ATTACKATOB || mAnm == ANM_DR_WIND_ATTACKB || -1000000000.0f != mAcch.GetGroundH() || mCount[3] == 0) {
|
||||
if (mAnm == ANM_DR_WIND_ATTACKATOB || mAnm == ANM_DR_WIND_ATTACKB || -G_CM3D_F_INF != mAcch.GetGroundH() || mCount[3] == 0) {
|
||||
field_0x74e = 0;
|
||||
}
|
||||
}
|
||||
@@ -3632,7 +3632,7 @@ void daB_DR_c::mtx_set() {
|
||||
sp28.SetPos(&sp1C);
|
||||
|
||||
f32 var_f31 = dComIfG_Bgsp().GroundCross(&sp28);
|
||||
if (-1000000000.0f == var_f31 || var_f31 < 5250.0f + JREG_F(4)) {
|
||||
if (-G_CM3D_F_INF == var_f31 || var_f31 < 5250.0f + JREG_F(4)) {
|
||||
var_f31 = 5250.0f + JREG_F(4);
|
||||
}
|
||||
field_0x7a8.y = var_f31;
|
||||
@@ -3648,7 +3648,7 @@ void daB_DR_c::mtx_set() {
|
||||
}
|
||||
}
|
||||
|
||||
if (mAnm == ANM_DR_WIND_ATTACKB && -1000000000.0f != mAcch.GetGroundH()) {
|
||||
if (mAnm == ANM_DR_WIND_ATTACKB && -G_CM3D_F_INF != mAcch.GetGroundH()) {
|
||||
cXyz sp10 = current.pos - home.pos;
|
||||
if (sp10.abs() > 3000.0f || current.pos.y > 370.0f) {
|
||||
if (field_0x7d8 == 0) {
|
||||
@@ -3746,7 +3746,7 @@ void daB_DR_c::cc_set() {
|
||||
mSound2.startCreatureSoundLevel(Z2SE_EN_DR_WIND_ATTACK, 0, -1);
|
||||
}
|
||||
|
||||
if (mAnm == ANM_DR_WIND_ATTACKB && -1000000000.0f != mAcch.GetGroundH() && mCount[1] > WREG_S(9)) {
|
||||
if (mAnm == ANM_DR_WIND_ATTACKB && -G_CM3D_F_INF != mAcch.GetGroundH() && mCount[1] > WREG_S(9)) {
|
||||
var_r27 = 1;
|
||||
}
|
||||
|
||||
@@ -4055,7 +4055,7 @@ int daB_DR_c::CreateHeap() {
|
||||
if (arg0 == 0x14 || arg0 == 0x15) {
|
||||
static int mPartDt[] = {74, 74, 75, 76, 77, 78};
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_DR", mPartDt[mPartNo]);
|
||||
JUT_ASSERT(6312, modelData != 0);
|
||||
JUT_ASSERT(6312, modelData != NULL);
|
||||
|
||||
mpPartModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
|
||||
if (mpPartModel == NULL) {
|
||||
@@ -4066,7 +4066,7 @@ int daB_DR_c::CreateHeap() {
|
||||
}
|
||||
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_DR", 0x49);
|
||||
JUT_ASSERT(6324, modelData != 0);
|
||||
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);
|
||||
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
|
||||
@@ -4286,7 +4286,7 @@ int daB_DR_c::create() {
|
||||
setActionMode(ACTION_GLIDER_ATTACK, 0);
|
||||
|
||||
mTargetHeight = 1500.0f + mAcch.GetGroundH();
|
||||
if (-1000000000.0f == mAcch.GetGroundH()) {
|
||||
if (-G_CM3D_F_INF == mAcch.GetGroundH()) {
|
||||
mTargetHeight = 1500.0f + current.pos.y;
|
||||
}
|
||||
if (dComIfGs_isZoneSwitch(1, fopAcM_GetRoomNo(this))) {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_dre.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
int daB_DRE_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_DR", 0x49);
|
||||
JUT_ASSERT(0xB4, modelData != 0);
|
||||
JUT_ASSERT(0xB4, modelData != NULL);
|
||||
|
||||
if (mAction == 0) {
|
||||
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL,
|
||||
|
||||
+18
-18
@@ -3,7 +3,7 @@
|
||||
* Boss - Stallord
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_ds.h"
|
||||
#include "d/actor/d_a_player.h"
|
||||
@@ -441,7 +441,7 @@ void daB_DS_c::mSmokeSet() {
|
||||
}
|
||||
|
||||
if (mAcch.ChkGroundHit()) {
|
||||
if (field_0x84d == 0 && mAcch.GetGroundH() != -1000000000.0f) {
|
||||
if (field_0x84d == 0 && mAcch.GetGroundH() != -G_CM3D_F_INF) {
|
||||
cXyz particle_scale(1.0f, 1.0f, 1.0f);
|
||||
cXyz particle_pos(current.pos);
|
||||
csXyz particle_angle(shape_angle);
|
||||
@@ -508,7 +508,7 @@ void daB_DS_c::handSPosSet(int i_hand) {
|
||||
gnd_chk.SetPos(&chk_pos);
|
||||
|
||||
chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
|
||||
if (chk_pos.y == -1000000000.0f) {
|
||||
if (chk_pos.y == -G_CM3D_F_INF) {
|
||||
chk_pos.y = mFingerPos[i_hand].y;
|
||||
}
|
||||
particle_pos = chk_pos - mHandPos[i_hand];
|
||||
@@ -525,7 +525,7 @@ void daB_DS_c::handSPosSet(int i_hand) {
|
||||
gnd_chk.SetPos(&particle_pos);
|
||||
|
||||
particle_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
|
||||
if (particle_pos.y == -1000000000.0f) {
|
||||
if (particle_pos.y == -G_CM3D_F_INF) {
|
||||
particle_pos.y = mHandPos[i_hand].y;
|
||||
}
|
||||
chk_pos = particle_pos - mHandPos[i_hand];
|
||||
@@ -600,7 +600,7 @@ void daB_DS_c::mZsMoveChk() {
|
||||
zs_pos.y += 2000.0f;
|
||||
gnd_chk.SetPos(&zs_pos);
|
||||
|
||||
if (zs_pos.y != -1000000000.0f) {
|
||||
if (zs_pos.y != -G_CM3D_F_INF) {
|
||||
zs_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
|
||||
} else {
|
||||
zs_pos.y = current.pos.y += 800.0f;
|
||||
@@ -665,7 +665,7 @@ void daB_DS_c::mZsMoveChk_Guard() {
|
||||
zs_pos.y += 2000.0f;
|
||||
gnd_chk.SetPos(&zs_pos);
|
||||
|
||||
if (zs_pos.y != -1000000000.0f) {
|
||||
if (zs_pos.y != -G_CM3D_F_INF) {
|
||||
zs_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
|
||||
} else {
|
||||
zs_pos.y = current.pos.y += 800.0f;
|
||||
@@ -1906,7 +1906,7 @@ void daB_DS_c::damageHitCamera() {
|
||||
offset.y = 300.0f;
|
||||
MtxPosition(&offset, &pos);
|
||||
pos.x += current.pos.x;
|
||||
if (mAcch.GetGroundH() != -1000000000.0f) {
|
||||
if (mAcch.GetGroundH() != -G_CM3D_F_INF) {
|
||||
pos.y += mAcch.GetGroundH();
|
||||
}
|
||||
pos.z += current.pos.z;
|
||||
@@ -1916,7 +1916,7 @@ void daB_DS_c::damageHitCamera() {
|
||||
offset.z = 700.0f;
|
||||
MtxPosition(&offset, &pos);
|
||||
pos.x += current.pos.x;
|
||||
if (mAcch.GetGroundH() != -1000000000.0f) {
|
||||
if (mAcch.GetGroundH() != -G_CM3D_F_INF) {
|
||||
pos.y += mAcch.GetGroundH();
|
||||
}
|
||||
pos.z += current.pos.z;
|
||||
@@ -2091,7 +2091,7 @@ void daB_DS_c::executeDamage() {
|
||||
sp1BC.z = 1000.0f;
|
||||
MtxPosition(&sp1BC, &sp1B0);
|
||||
sp1B0 += current.pos;
|
||||
if (mAcch.GetGroundH() != -1000000000.0f) {
|
||||
if (mAcch.GetGroundH() != -G_CM3D_F_INF) {
|
||||
sp1B0.y = mAcch.GetGroundH();
|
||||
}
|
||||
|
||||
@@ -3329,7 +3329,7 @@ void daB_DS_c::executeBattle2Damage() {
|
||||
chk_pos.y += 300.0f;
|
||||
gnd_chk.SetPos(&chk_pos);
|
||||
chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
|
||||
if (chk_pos.y == -1000000000.0f) {
|
||||
if (chk_pos.y == -G_CM3D_F_INF) {
|
||||
chk_pos.y = current.pos.y - 200.0f;
|
||||
}
|
||||
|
||||
@@ -5253,7 +5253,7 @@ int daB_DS_c::execute() {
|
||||
chk_pos.y += 3000.0f;
|
||||
gnd_chk.SetPos(&chk_pos);
|
||||
chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
|
||||
if (chk_pos.y == -1000000000.0f) {
|
||||
if (chk_pos.y == -G_CM3D_F_INF) {
|
||||
chk_pos.y = jnt_pos.y;
|
||||
}
|
||||
|
||||
@@ -5276,7 +5276,7 @@ int daB_DS_c::execute() {
|
||||
chk_pos.y += 3000.0f;
|
||||
gnd_chk.SetPos(&chk_pos);
|
||||
chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
|
||||
if (chk_pos.y == -1000000000.0f) {
|
||||
if (chk_pos.y == -G_CM3D_F_INF) {
|
||||
chk_pos.y = jnt_pos.y;
|
||||
}
|
||||
|
||||
@@ -5391,7 +5391,7 @@ int daB_DS_c::CreateHeap() {
|
||||
anm_res = ANM_HEAD_FWAIT;
|
||||
}
|
||||
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
JUT_ASSERT(0, modelData != NULL);
|
||||
|
||||
mpMorf = new mDoExt_McaMorfSO(
|
||||
modelData, NULL, NULL, static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", anm_res)),
|
||||
@@ -5409,7 +5409,7 @@ int daB_DS_c::CreateHeap() {
|
||||
}
|
||||
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("B_DS", 74);
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
JUT_ASSERT(0, modelData != NULL);
|
||||
|
||||
mpSwordMorf = new mDoExt_McaMorfSO(
|
||||
modelData, NULL, NULL, static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 63)), 0,
|
||||
@@ -5431,7 +5431,7 @@ int daB_DS_c::CreateHeap() {
|
||||
}
|
||||
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("B_DS", 75);
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
JUT_ASSERT(0, modelData != NULL);
|
||||
|
||||
mpZantMorf = new mDoExt_McaMorfSO(
|
||||
modelData, NULL, NULL, static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 66)), 2,
|
||||
@@ -5441,7 +5441,7 @@ int daB_DS_c::CreateHeap() {
|
||||
}
|
||||
|
||||
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("B_DS", 73));
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
JUT_ASSERT(0, modelData != NULL);
|
||||
|
||||
mpOpPatternModel = mDoExt_J3DModel__create(modelData, 0, 0x11000284);
|
||||
if (mpOpPatternModel == NULL) {
|
||||
@@ -5473,7 +5473,7 @@ int daB_DS_c::CreateHeap() {
|
||||
}
|
||||
|
||||
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("B_DS", 72));
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
JUT_ASSERT(0, modelData != NULL);
|
||||
|
||||
mpPatternModel = mDoExt_J3DModel__create(modelData, 0, 0x11000284);
|
||||
if (mpPatternModel == NULL) {
|
||||
@@ -5624,7 +5624,7 @@ cPhs__Step daB_DS_c::create() {
|
||||
gnd_chk.SetPos(&chk_pos);
|
||||
|
||||
chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
|
||||
if (chk_pos.y != -1000000000.0f) {
|
||||
if (chk_pos.y != -G_CM3D_F_INF) {
|
||||
current.pos.y = chk_pos.y;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_gg.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -154,7 +154,7 @@ daB_GG_HIO_c::daB_GG_HIO_c() {
|
||||
int daB_GG_c::CreateHeap() {
|
||||
J3DModelData* modelData;
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("B_gg", 0x23);
|
||||
JUT_ASSERT(207, modelData != 0);
|
||||
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);
|
||||
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
|
||||
@@ -4494,7 +4494,7 @@ int daB_GG_c::Create() {
|
||||
SetAnm(BCK_GG_WAIT, 2, 5.0f, 1.0f);
|
||||
fopAcM_OnStatus(this, 0x200000);
|
||||
|
||||
if (-1000000000.0f != mAcch.GetGroundH()) {
|
||||
if (-G_CM3D_F_INF != mAcch.GetGroundH()) {
|
||||
current.pos.y = mAcch.GetGroundH();
|
||||
field_0x648 = mAcch.GetGroundH();
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_gm.h"
|
||||
#include "d/actor/d_a_e_gm.h"
|
||||
@@ -2086,7 +2086,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
|
||||
J3DModelData* modelData;
|
||||
for (int i = 0; i < 4; i++) {
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("B_gm", 0x22);
|
||||
JUT_ASSERT(0xCE9, modelData != 0);
|
||||
JUT_ASSERT(0xCE9, modelData != NULL);
|
||||
a_this->mpSpotLightModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284);
|
||||
if (a_this->mpSpotLightModel[i] == NULL) {
|
||||
return 0;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_gnd.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -4088,7 +4088,7 @@ static int daB_GND_Execute(b_gnd_class* i_this) {
|
||||
sp6C->setBaseTRMtx(mDoMtx_stack_c::get());
|
||||
|
||||
u32 sp68;
|
||||
if (i_this->mAcch.GetGroundH() != -1000000000.0f) {
|
||||
if (i_this->mAcch.GetGroundH() != -G_CM3D_F_INF) {
|
||||
if (i_this->mAcch.ChkWaterHit() && i_this->mAcch.m_wtr.GetHeight() > a_this->current.pos.y) {
|
||||
sp68 = dKy_pol_sound_get(&i_this->mAcch.m_wtr);
|
||||
} else if (i_this->mAcch.ChkGroundHit()) {
|
||||
@@ -4692,7 +4692,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
|
||||
|
||||
J3DModelData* modelData;
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("B_gnd", 0x62);
|
||||
JUT_ASSERT(6612, modelData != 0);
|
||||
JUT_ASSERT(6612, modelData != NULL);
|
||||
i_this->mpSwordModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (i_this->mpSwordModel == NULL) {
|
||||
return 0;
|
||||
@@ -4702,7 +4702,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
|
||||
i_this->mpSwordModel->setBaseTRMtx(mDoMtx_stack_c::get());
|
||||
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("B_gnd", 0x61);
|
||||
JUT_ASSERT(6626, modelData != 0);
|
||||
JUT_ASSERT(6626, modelData != NULL);
|
||||
i_this->mpSheathModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (i_this->mpSheathModel == NULL) {
|
||||
return 0;
|
||||
@@ -4713,7 +4713,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
|
||||
|
||||
for (int i = 0; i < 2; i++) {
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("B_gnd", blur_model[i]);
|
||||
JUT_ASSERT(6647, modelData != 0);
|
||||
JUT_ASSERT(6647, modelData != NULL);
|
||||
i_this->mpSwordBlurModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (i_this->mpSwordBlurModel[i] == NULL) {
|
||||
return 0;
|
||||
@@ -4724,7 +4724,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
|
||||
}
|
||||
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("B_gnd", 99);
|
||||
JUT_ASSERT(6670, modelData != 0);
|
||||
JUT_ASSERT(6670, modelData != NULL);
|
||||
|
||||
for (int i = 0; i < 36; i++) {
|
||||
i_this->mpMantShadowModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_go.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Combined Goron Child
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_gos.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
|
||||
+13
-13
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_mgn.h"
|
||||
#include "d/actor/d_a_obj_bhashi.h"
|
||||
@@ -304,7 +304,7 @@ int daB_MGN_c::draw() {
|
||||
|
||||
dBgS_GndChk gndchk;
|
||||
f32 gnd_height;
|
||||
if (mAcch.GetGroundH() == -1000000000.0f) {
|
||||
if (mAcch.GetGroundH() == -G_CM3D_F_INF) {
|
||||
cXyz spC(current.pos);
|
||||
gndchk.SetPos(&spC);
|
||||
gnd_height = dComIfG_Bgsp().GroundCross(&gndchk);
|
||||
@@ -406,7 +406,7 @@ void daB_MGN_c::setDashSmokeEffect() {
|
||||
gndchk.SetPos(&effpos);
|
||||
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
|
||||
|
||||
if (effpos.y != -1000000000.0f) {
|
||||
if (effpos.y != -G_CM3D_F_INF) {
|
||||
fopAcM_effSmokeSet1(&field_0x25f8[var_r27], &field_0x2608[var_r27], &effpos, NULL, 3.0f, &tevStr, 1);
|
||||
}
|
||||
}
|
||||
@@ -448,7 +448,7 @@ void daB_MGN_c::setBackJumpEffect() {
|
||||
gndchk.SetPos(&effpos);
|
||||
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
|
||||
|
||||
if (effpos.y != -1000000000.0f) {
|
||||
if (effpos.y != -G_CM3D_F_INF) {
|
||||
fopAcM_effSmokeSet1(&field_0x25f8[var_r27], &field_0x2608[var_r27], &effpos, NULL, 3.0f, &tevStr, 1);
|
||||
}
|
||||
}
|
||||
@@ -469,7 +469,7 @@ void daB_MGN_c::setSlideSmokeEffect() {
|
||||
gndchk.SetPos(&effpos);
|
||||
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
|
||||
|
||||
if (effpos.y != -1000000000.0f) {
|
||||
if (effpos.y != -G_CM3D_F_INF) {
|
||||
fopAcM_effSmokeSet2(&field_0x25f8[i], &field_0x2608[i], &effpos, NULL, 3.0f, &tevStr);
|
||||
}
|
||||
}
|
||||
@@ -496,7 +496,7 @@ void daB_MGN_c::setBodySlideEffect() {
|
||||
gndchk.SetPos(&effpos);
|
||||
|
||||
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
|
||||
if (effpos.y != -1000000000.0f) {
|
||||
if (effpos.y != -G_CM3D_F_INF) {
|
||||
fopAcM_effSmokeSet2(&field_0x25f8[i], &field_0x2608[i], &effpos, NULL, 10.0f, &tevStr);
|
||||
}
|
||||
}
|
||||
@@ -514,7 +514,7 @@ void daB_MGN_c::setOpeningEffect() {
|
||||
gndchk.SetPos(&effpos);
|
||||
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
|
||||
|
||||
if (effpos.y != -1000000000.0f) {
|
||||
if (effpos.y != -G_CM3D_F_INF) {
|
||||
fopAcM_effSmokeSet1(&field_0x25f8[0], &field_0x2608[0], &effpos, NULL, 15.0f, &tevStr, 1);
|
||||
}
|
||||
|
||||
@@ -524,7 +524,7 @@ void daB_MGN_c::setOpeningEffect() {
|
||||
gndchk.SetPos(&effpos);
|
||||
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
|
||||
|
||||
if (effpos.y != -1000000000.0f) {
|
||||
if (effpos.y != -G_CM3D_F_INF) {
|
||||
fopAcM_effSmokeSet1(&field_0x25f8[1], &field_0x2608[1], &effpos, NULL, 15.0f, &tevStr, 1);
|
||||
}
|
||||
}
|
||||
@@ -546,7 +546,7 @@ void daB_MGN_c::setStepEffect() {
|
||||
|
||||
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
|
||||
|
||||
if (effpos.y != -1000000000.0f) {
|
||||
if (effpos.y != -G_CM3D_F_INF) {
|
||||
fopAcM_effSmokeSet1(&field_0x25f8[i], &field_0x2608[i], &effpos, NULL, 3.0f, &tevStr, 1);
|
||||
}
|
||||
}
|
||||
@@ -573,7 +573,7 @@ void daB_MGN_c::setFallAttackEffect() {
|
||||
|
||||
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
|
||||
|
||||
if (effpos.y != -1000000000.0f) {
|
||||
if (effpos.y != -G_CM3D_F_INF) {
|
||||
fopAcM_effSmokeSet1(&field_0x25f8[i], &field_0x2608[i], &effpos, NULL, 10.0f, &tevStr, 1);
|
||||
}
|
||||
}
|
||||
@@ -3348,7 +3348,7 @@ static int daB_MGN_Delete(daB_MGN_c* i_this) {
|
||||
/* 8060EAE0-8060F068 0094A0 0588+00 1/1 0/0 0/0 .text CreateHeap__9daB_MGN_cFv */
|
||||
int daB_MGN_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_mgn", BMDR_MGN);
|
||||
JUT_ASSERT(4010, modelData != 0);
|
||||
JUT_ASSERT(4010, modelData != NULL);
|
||||
mpMgnModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL,
|
||||
(J3DAnmTransform*)dComIfG_getObjectRes("B_mgn", BCK_MGN_WAIT), 2,
|
||||
1.0f, 0, -1, &mSound, 0x80000, 0x11000284);
|
||||
@@ -3389,7 +3389,7 @@ int daB_MGN_c::CreateHeap() {
|
||||
}
|
||||
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("B_mgn", BMDR_MGN_TAIEKI);
|
||||
JUT_ASSERT(4068, modelData != 0);
|
||||
JUT_ASSERT(4068, modelData != NULL);
|
||||
|
||||
for (int i = 0; i < 20; i++) {
|
||||
mpMgnTaiekiModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
@@ -3399,7 +3399,7 @@ int daB_MGN_c::CreateHeap() {
|
||||
}
|
||||
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("B_mgne", BMDR_EF_GDGATE);
|
||||
JUT_ASSERT(4084, modelData != 0);
|
||||
JUT_ASSERT(4084, modelData != NULL);
|
||||
|
||||
for (int i = 0; i < 4; i++) {
|
||||
mpGdgateModelMorf[i] = new mDoExt_McaMorfSO(modelData, NULL, NULL,
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
// Translation Unit: d_a_b_ob
|
||||
//
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_ob.h"
|
||||
#include "JSystem/J3DGraphBase/J3DMaterial.h"
|
||||
@@ -3491,7 +3491,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
|
||||
}
|
||||
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_EF_OISUI);
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
JUT_ASSERT(0, modelData != NULL);
|
||||
|
||||
a_this->mpSuiModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284);
|
||||
if (a_this->mpSuiModel == NULL) {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Morpheel Tentacle
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_ob.h"
|
||||
#include "d/actor/d_a_b_oh.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Morpheel Tentacle
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_oh2.h"
|
||||
#include "d/actor/d_a_b_ob.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_tn.h"
|
||||
#include <cmath.h>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_yo.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_yo_ice.h"
|
||||
#include "JSystem/J3DGraphBase/J3DMaterial.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_zant.h"
|
||||
#include "d/actor/d_a_b_zant_mobile.h"
|
||||
@@ -1240,7 +1240,7 @@ void daB_ZANT_c::executeWarp() {
|
||||
gndchk.SetPos(&mFlyWarpPos);
|
||||
|
||||
f32 gnd_y = dComIfG_Bgsp().GroundCross(&gndchk);
|
||||
if (gnd_y != -1000000000.0f) {
|
||||
if (gnd_y != -G_CM3D_F_INF) {
|
||||
mFlyWarpPos.y = gnd_y;
|
||||
}
|
||||
|
||||
@@ -1784,7 +1784,7 @@ void daB_ZANT_c::executeFly() {
|
||||
gndchk.SetPos(&sp9C);
|
||||
{
|
||||
f32 gnd_pos = dComIfG_Bgsp().GroundCross(&gndchk);
|
||||
if (gnd_pos != -1000000000.0f && current.pos.y <= gnd_pos) {
|
||||
if (gnd_pos != -G_CM3D_F_INF && current.pos.y <= gnd_pos) {
|
||||
if (dComIfG_Bgsp().GetPolyAtt0(gndchk) == 11) {
|
||||
speed.y = 50.0f;
|
||||
speedF = 15.0f;
|
||||
@@ -5483,7 +5483,7 @@ static int daB_ZANT_Delete(daB_ZANT_c* i_this) {
|
||||
/* 8064DC04-8064E128 00FBE4 0524+00 1/1 0/0 0/0 .text CreateHeap__10daB_ZANT_cFv */
|
||||
int daB_ZANT_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", BMDR_ZAN);
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
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);
|
||||
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
|
||||
return 0;
|
||||
@@ -5550,14 +5550,14 @@ int daB_ZANT_c::CreateHeap() {
|
||||
}
|
||||
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", BMDR_ZAN_SWORD_L);
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
JUT_ASSERT(0, modelData != NULL);
|
||||
mpSwordLModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (mpSwordLModel == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", BMDR_ZAN_SWORD_R);
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
JUT_ASSERT(0, modelData != NULL);
|
||||
mpSwordRModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (mpSwordRModel == NULL) {
|
||||
return 0;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_zant_magic.h"
|
||||
#include "d/actor/d_a_b_zant.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_zant_mobile.h"
|
||||
#include "d/actor/d_a_b_zant.h"
|
||||
@@ -201,7 +201,7 @@ f32 daB_ZANTZ_c::getGroundPos() {
|
||||
gndchk.SetPos(&sp88);
|
||||
sp88.y = dComIfG_Bgsp().GroundCross(&gndchk);
|
||||
|
||||
if (sp88.y == -1000000000.0f) {
|
||||
if (sp88.y == -G_CM3D_F_INF) {
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -422,7 +422,7 @@ static int daB_ZANTZ_Delete(daB_ZANTZ_c* i_this) {
|
||||
/* 80651DC4-80651FD0 001724 020C+00 1/1 0/0 0/0 .text CreateHeap__11daB_ZANTZ_cFv */
|
||||
int daB_ZANTZ_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", daB_ZANT_c::BMDR_ZZ);
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
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);
|
||||
if (mpMorf == NULL) {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Boss Zant Lava Island
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_b_zant_sima.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_balloon_2D.h"
|
||||
#include "JSystem/J2DGraph/J2DGrafContext.h"
|
||||
@@ -163,7 +163,7 @@ int daBalloon2D_c::createHeap() {
|
||||
return 0;
|
||||
}
|
||||
dRes_info_c* resInfo = dComIfG_getObjectResInfo(l_arcName);
|
||||
JUT_ASSERT(445, resInfo != 0);
|
||||
JUT_ASSERT(445, resInfo != NULL);
|
||||
JKRArchive* arc = resInfo->getArchive();
|
||||
mScreen->setPriority("zelda_balloon_game.blo", 0x20000, arc);
|
||||
dPaneClass_showNullPane(mScreen);
|
||||
@@ -243,7 +243,7 @@ int daBalloon2D_c::create() {
|
||||
if (!fopAcM_entrySolidHeap(this, daBalloon2D_createHeap, 0)) {
|
||||
return cPhs_ERROR_e;
|
||||
}
|
||||
JUT_ASSERT(566, daBalloon2D_c::myclass == 0);
|
||||
JUT_ASSERT(566, daBalloon2D_c::myclass == NULL);
|
||||
myclass = this;
|
||||
setHIO(true);
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_bd.h"
|
||||
#include "d/actor/d_a_cow.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_bg.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -515,7 +515,7 @@ int daBg_c::create() {
|
||||
JKRExpHeap* room_heap = dStage_roomControl_c::getMemoryBlock(roomNo);
|
||||
if (room_heap != NULL) {
|
||||
this->heap = JKRCreateSolidHeap(-1, room_heap, false);
|
||||
JUT_ASSERT(471, heap != 0);
|
||||
JUT_ASSERT(471, heap != NULL);
|
||||
|
||||
JKRHeap* old = mDoExt_setCurrentHeap(this->heap);
|
||||
int rt = createHeap();
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_bg_obj.h"
|
||||
#include "JSystem/J3DGraphBase/J3DMaterial.h"
|
||||
@@ -133,7 +133,7 @@ u8* daBgObj_c::spec_data_c::initFarInfoBlock(u8* i_dataPtr) {
|
||||
*/
|
||||
// NONMATCHING - close-ish
|
||||
bool daBgObj_c::spec_data_c::Set(void* i_ptr) {
|
||||
JUT_ASSERT(496, i_ptr != 0);
|
||||
JUT_ASSERT(496, i_ptr != NULL);
|
||||
|
||||
u8* data = (u8*)i_ptr;
|
||||
|
||||
@@ -406,8 +406,8 @@ void daBgObj_c::settingCullSizeBoxForCo(int param_0) {
|
||||
|
||||
/* 80459F14-8045A0EC 000934 01D8+00 3/3 0/0 0/0 .text settingCullSizeBoxForCull__9daBgObj_cFi */
|
||||
void daBgObj_c::settingCullSizeBoxForCull(int param_0) {
|
||||
cXyz max(1000000000.0f, 1000000000.0f, 1000000000.0f);
|
||||
cXyz min(-1000000000.0f, -1000000000.0f, -1000000000.0f);
|
||||
cXyz max(G_CM3D_F_INF, G_CM3D_F_INF, G_CM3D_F_INF);
|
||||
cXyz min(-G_CM3D_F_INF, -G_CM3D_F_INF, -G_CM3D_F_INF);
|
||||
|
||||
for (int i = 0; i < 2; i++) {
|
||||
J3DModel* cur_model = field_0x5a8[param_0][i];
|
||||
@@ -448,7 +448,7 @@ void daBgObj_c::settingCullSizeBoxForCull(int param_0) {
|
||||
}
|
||||
}
|
||||
|
||||
if (1000000000.0f != max.x) {
|
||||
if (G_CM3D_F_INF != max.x) {
|
||||
fopAcM_setCullSizeBox(this, max.x, max.y, max.z, min.x, min.y, min.z);
|
||||
} else {
|
||||
fopAcM_setCullSizeBox(this, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
|
||||
@@ -974,7 +974,7 @@ void daBgObj_c::setParticle() {
|
||||
switch (modelNumber) {
|
||||
case 1:
|
||||
bmd = (J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd");
|
||||
JUT_ASSERT(1683, bmd != 0);
|
||||
JUT_ASSERT(1683, bmd != NULL);
|
||||
scale.setall(KREG_F(29) + 0.9f);
|
||||
break;
|
||||
default:
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_boomerang.h"
|
||||
#include "JSystem/J2DGraph/J2DAnmLoader.h"
|
||||
@@ -663,7 +663,7 @@ void daBoomerang_c::setRoomInfo() {
|
||||
mGroundY = dComIfG_Bgsp().GroundCross(&m_gndChk);
|
||||
|
||||
int roomNo;
|
||||
if (mGroundY != -1000000000.0f) {
|
||||
if (mGroundY != -G_CM3D_F_INF) {
|
||||
roomNo = dComIfG_Bgsp().GetRoomId(m_gndChk);
|
||||
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(m_gndChk);
|
||||
} else {
|
||||
@@ -1295,7 +1295,7 @@ int daBoomerang_c::execute() {
|
||||
if (fopAcM_rc_c::roofCheck(&spC) && dComIfG_Bgsp().GetUnderwaterRoofCode(*fopAcM_rc_c::getRoofCheck()) == 0) {
|
||||
roof_y = fopAcM_rc_c::getRoofY();
|
||||
} else {
|
||||
roof_y = 1000000000.0f;
|
||||
roof_y = G_CM3D_F_INF;
|
||||
}
|
||||
|
||||
if (roof_y > fopAcM_wt_c::getWaterY() && current.pos.y < fopAcM_wt_c::getWaterY() - 50.0f) {
|
||||
@@ -1414,21 +1414,21 @@ int daBoomerang_c::createHeap() {
|
||||
m_sight.initialize();
|
||||
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(daAlink_c::getAlinkArcName(), 0x1F);
|
||||
JUT_ASSERT(2882, modelData != 0);
|
||||
JUT_ASSERT(2882, modelData != NULL);
|
||||
mp_boomModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (mp_boomModel == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes(daAlink_c::getAlinkArcName(), 0x34);
|
||||
JUT_ASSERT(2898, modelData != 0);
|
||||
JUT_ASSERT(2898, modelData != NULL);
|
||||
mp_shippuModel = mDoExt_J3DModel__create(modelData, 0, 0x11000284);
|
||||
if (mp_shippuModel == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
J3DAnmTransform* transAnm = (J3DAnmTransform*)dComIfG_getObjectRes(daAlink_c::getAlinkArcName(), 0x13);
|
||||
JUT_ASSERT(2911, transAnm != 0);
|
||||
JUT_ASSERT(2911, transAnm != NULL);
|
||||
if (m_shippuBck.init(transAnm, 0, 2, 1.0f, 0, -1, false) == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_bullet.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -58,7 +58,7 @@ int daBullet_c::create() {
|
||||
/* 80655E5C-80655EDC 0005FC 0080+00 1/1 0/0 0/0 .text CreateHeap__10daBullet_cFv */
|
||||
BOOL daBullet_c::CreateHeap() {
|
||||
void* mdlData_p = dComIfG_getObjectRes(getResName(), getBmdName());
|
||||
JUT_ASSERT(273, 0 != mdlData_p);
|
||||
JUT_ASSERT(273, NULL != mdlData_p);
|
||||
mpModel = mDoExt_J3DModel__create((J3DModelData*)mdlData_p, 0x80000, 0x11000084);
|
||||
return mpModel != NULL;
|
||||
}
|
||||
@@ -94,11 +94,11 @@ int daBullet_c::Execute() {
|
||||
mGndChk = mAcch.m_gnd;
|
||||
mGroundY = mAcch.GetGroundH();
|
||||
} else {
|
||||
mGroundY = -1000000000.0f;
|
||||
mGroundY = -G_CM3D_F_INF;
|
||||
}
|
||||
|
||||
int room_no;
|
||||
if (mGroundY != -1000000000.0f) {
|
||||
if (mGroundY != -G_CM3D_F_INF) {
|
||||
room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
|
||||
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
|
||||
} else {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_canoe.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -199,7 +199,7 @@ static int daCanoe_Delete(daCanoe_c* i_this) {
|
||||
/* 804DB008-804DB0B0 000BA8 00A8+00 1/1 0/0 0/0 .text setRoomInfo__9daCanoe_cFv */
|
||||
void daCanoe_c::setRoomInfo() {
|
||||
int room_no;
|
||||
if (mAcch[0].GetGroundH() != -1000000000.0f) {
|
||||
if (mAcch[0].GetGroundH() != -G_CM3D_F_INF) {
|
||||
room_no = dComIfG_Bgsp().GetRoomId(mAcch[0].m_gnd);
|
||||
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mAcch[0].m_gnd);
|
||||
} else {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_coach_2D.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -118,7 +118,7 @@ int daCoach2D_c::createHeap() {
|
||||
}
|
||||
|
||||
dRes_info_c* resInfo = dComIfG_getObjectResInfo(l_arcName);
|
||||
JUT_ASSERT(285, resInfo != 0);
|
||||
JUT_ASSERT(285, resInfo != NULL);
|
||||
|
||||
JKRArchive* archive = resInfo->getArchive();
|
||||
mpScrn->setPriority("zelda_game_image_fire_icon.blo", 0x20000, archive);
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_coach_fire.h"
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_cow.h"
|
||||
#include "SSystem/SComponent/c_lib.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Dominion Rod Object
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_crod.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_cstaF.h"
|
||||
#include "d/actor/d_a_alink.h"
|
||||
@@ -230,7 +230,7 @@ static int daCstaF_Delete(daCstaF_c* a_this) {
|
||||
/* 804DE558-804DE5F0 000C78 0098+00 2/2 0/0 0/0 .text setRoomInfo__9daCstaF_cFv */
|
||||
void daCstaF_c::setRoomInfo() {
|
||||
int room_no;
|
||||
if (m_acch.GetGroundH() != -1000000000.0f) {
|
||||
if (m_acch.GetGroundH() != -G_CM3D_F_INF) {
|
||||
room_no = dComIfG_Bgsp().GetRoomId(m_acch.m_gnd);
|
||||
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(m_acch.m_gnd);
|
||||
} else {
|
||||
@@ -308,7 +308,7 @@ void daCstaF_c::posMove() {
|
||||
m_cc_stts.ClrCcMove();
|
||||
m_acch.CrrPos(dComIfG_Bgsp());
|
||||
|
||||
if (pre_gnd_hit && !m_acch.ChkGroundHit() && -1000000000.0f != m_acch.GetGroundH()) {
|
||||
if (pre_gnd_hit && !m_acch.ChkGroundHit() && -G_CM3D_F_INF != m_acch.GetGroundH()) {
|
||||
f32 ground_dist = m_acch.GetGroundH() - current.pos.y;
|
||||
cM3dGPla tri;
|
||||
dComIfG_Bgsp().GetTriPla(m_acch.m_gnd, &tri);
|
||||
@@ -498,7 +498,7 @@ int daCstaF_c::Execute(Mtx** param_0) {
|
||||
posMove();
|
||||
|
||||
int poly_sound;
|
||||
if (m_acch.GetGroundH() != -1000000000.0f) {
|
||||
if (m_acch.GetGroundH() != -G_CM3D_F_INF) {
|
||||
poly_sound = dKy_pol_sound_get(&m_acch.m_gnd);
|
||||
} else {
|
||||
poly_sound = 0;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_cstatue.h"
|
||||
#include <Z2AudioLib/Z2Instances.h>
|
||||
@@ -433,7 +433,7 @@ static int daCstatue_Delete(void* actor) {
|
||||
/* 80664AA0-80664B38 0014E0 0098+00 2/2 0/0 0/0 .text setRoomInfo__11daCstatue_cFv */
|
||||
void daCstatue_c::setRoomInfo() {
|
||||
int roomId;
|
||||
if (mStatueAcch.GetGroundH() != -1000000000.0f) {
|
||||
if (mStatueAcch.GetGroundH() != -G_CM3D_F_INF) {
|
||||
roomId = dComIfG_Bgsp().GetRoomId(mStatueAcch.m_gnd);
|
||||
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mStatueAcch.m_gnd);
|
||||
} else {
|
||||
@@ -475,7 +475,7 @@ void daCstatue_c::setMatrix() {
|
||||
void daCstatue_c::posMove() {
|
||||
if (checkStateFlg0(daCstatue_FLG0_8)) {
|
||||
mStatueAcch.CrrPos(dComIfG_Bgsp());
|
||||
if (mStatueAcch.GetGroundH() == -1000000000.0f) {
|
||||
if (mStatueAcch.GetGroundH() == -G_CM3D_F_INF) {
|
||||
return;
|
||||
}
|
||||
if (dComIfG_Bgsp().ChkMoveBG_NoDABg(mStatueAcch.m_gnd)) {
|
||||
@@ -584,7 +584,7 @@ void daCstatue_c::posMove() {
|
||||
current.pos += *mStts.GetCCMoveP();
|
||||
mStts.ClrCcMove();
|
||||
mStatueAcch.CrrPos(dComIfG_Bgsp());
|
||||
if (groundHit && !mStatueAcch.ChkGroundHit() && mStatueAcch.GetGroundH() != -1000000000.0f)
|
||||
if (groundHit && !mStatueAcch.ChkGroundHit() && mStatueAcch.GetGroundH() != -G_CM3D_F_INF)
|
||||
{
|
||||
f32 groundDistance = mStatueAcch.GetGroundH() - current.pos.y;
|
||||
cM3dGPla plane;
|
||||
@@ -1137,7 +1137,7 @@ int daCstatue_c::execute() {
|
||||
}
|
||||
}
|
||||
u32 morf =
|
||||
mStatueAcch.GetGroundH() != -1000000000.0f ? dKy_pol_sound_get(&mStatueAcch.m_gnd) : 0;
|
||||
mStatueAcch.GetGroundH() != -G_CM3D_F_INF ? dKy_pol_sound_get(&mStatueAcch.m_gnd) : 0;
|
||||
mpMorf->play(morf, mReverb);
|
||||
if (!bossType && mCurrentAnim == CStatueAnimIndex_2 && link->checkCopyRodSwingMode()) {
|
||||
if (mpMorf->getEndFrame() > link->getBaseAnimeFrame()) {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_demo00.h"
|
||||
#include "JSystem/JKernel/JKRSolidHeap.h"
|
||||
@@ -110,7 +110,7 @@ void daDemo00_c::setBaseMtx() {
|
||||
field_0x568 = current.pos;
|
||||
|
||||
if (mground2 != 0) {
|
||||
if (sp38.y != -1000000000.0f) {
|
||||
if (sp38.y != -G_CM3D_F_INF) {
|
||||
bVar1 = dComIfG_Bgsp().GetTriPla(mBgc->mGndChk, &plane);
|
||||
}
|
||||
|
||||
@@ -229,7 +229,7 @@ int daDemo00_c::createHeap() {
|
||||
if (modelData == NULL) {
|
||||
OS_REPORT("\ngetDemoArcName=[%s]", dStage_roomControl_c::getDemoArcName());
|
||||
OS_REPORT("\nmModel.mID.mShapeID=[%d]\n", mModel.mID.mShapeID);
|
||||
JUT_ASSERT(441, modelData != 0);
|
||||
JUT_ASSERT(441, modelData != NULL);
|
||||
}
|
||||
|
||||
s32 uVar1 = 0x11000084;
|
||||
@@ -331,7 +331,7 @@ int daDemo00_c::createHeap() {
|
||||
}
|
||||
} else {
|
||||
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectIDRes(dStage_roomControl_c::getDemoArcName(), (u16)mModel.mID.field_0x4);
|
||||
JUT_ASSERT(580, anm != 0);
|
||||
JUT_ASSERT(580, anm != NULL);
|
||||
|
||||
if (field_0x6a5 != 0) {
|
||||
uVar1 |= 0x20000000;
|
||||
@@ -387,7 +387,7 @@ int daDemo00_c::createHeap() {
|
||||
if (mModel.mID.field_0x1c != -1) {
|
||||
mDeformData = (J3DDeformData*)dComIfG_getObjectIDRes(dStage_roomControl_c::getDemoArcName(), (u16)mModel.mID.field_0x1c);
|
||||
// Should be mModel.mDeformData
|
||||
JUT_ASSERT(687, mDeformData != 0);
|
||||
JUT_ASSERT(687, mDeformData != NULL);
|
||||
|
||||
if (mModel.mID.field_0x20 != -1) {
|
||||
mpBlkAnm = new mDoExt_blkAnm();
|
||||
@@ -559,7 +559,7 @@ int daDemo00_c::actPerformance(dDemo_actor_c* actor) {
|
||||
|
||||
if (mModel.mID.field_0x20 != mModel.field_0x0.field_0x20) {
|
||||
// Should be mModel.mDeformData and mModel.mBlkAnm
|
||||
JUT_ASSERT(1049, mDeformData != 0 && mpBlkAnm != 0);
|
||||
JUT_ASSERT(1049, mDeformData != NULL && mpBlkAnm != NULL);
|
||||
|
||||
J3DAnmCluster* anmCluster = (J3DAnmCluster*)dComIfG_getObjectIDRes(dStage_roomControl_c::getDemoArcName(), (u16)mModel.field_0x0.field_0x20);
|
||||
if (anmCluster == NULL) {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_demo_item.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Disappear death effect when an enemy is defeated
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_disappear.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Dying Midna Actor
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_dmidna.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
// Every function matches, but a Z2SoundObjSimple dtor is generated that should not exist
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "c/c_damagereaction.h"
|
||||
#include "d/actor/d_a_canoe.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Boss Door
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_door_boss.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
// Translation Unit: Boss Door L1
|
||||
//
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_door_bossL1.h"
|
||||
#include "d/actor/d_a_obj_keyhole.h"
|
||||
@@ -182,7 +182,7 @@ const char* daBdoorL1_c::getDzb() {
|
||||
*/
|
||||
J3DModelData* daBdoorL1_c::getDoorModelData() {
|
||||
J3DModelData* door_model = static_cast<J3DModelData*>(dComIfG_getObjectRes(getArcName(), getBmd()));
|
||||
JUT_ASSERT(256, door_model != 0)
|
||||
JUT_ASSERT(256, door_model != NULL)
|
||||
return door_model;
|
||||
}
|
||||
|
||||
@@ -205,7 +205,7 @@ static u32 const l_heap_size[11] = {
|
||||
int daBdoorL1_c::CreateHeap() {
|
||||
int nowLevel = getNowLevel();
|
||||
J3DModelData* modelData = getDoorModelData();
|
||||
JUT_ASSERT(313, modelData != 0);
|
||||
JUT_ASSERT(313, modelData != NULL);
|
||||
u32 dlistFlag = 0x11000084;
|
||||
if (nowLevel == 8) {
|
||||
dlistFlag |= 0x200;
|
||||
@@ -225,14 +225,14 @@ int daBdoorL1_c::CreateHeap() {
|
||||
}
|
||||
if (nowLevel == 8) {
|
||||
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(getArcName(), "door_shutterBoss.btk");
|
||||
JUT_ASSERT(341, pbtk != 0);
|
||||
JUT_ASSERT(341, pbtk != NULL);
|
||||
field_0x58c = 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 != 0);
|
||||
JUT_ASSERT(354, anm != NULL);
|
||||
field_0x588 = new mDoExt_bckAnm();
|
||||
if (field_0x588 == NULL || !field_0x588->init(anm, 1, 0, 1.0f, 0, -1,false)) {
|
||||
return 0;
|
||||
@@ -310,7 +310,7 @@ void daBdoorL1_c::calcMtx() {
|
||||
MTXCopy(mDoMtx_stack_c::get(), field_0x7ec);
|
||||
break;
|
||||
default:
|
||||
JUT_ASSERT(442, 0);
|
||||
JUT_ASSERT(442, FALSE);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -560,7 +560,7 @@ int daBdoorL1_c::openInit() {
|
||||
dComIfG_Bgsp().Release(field_0x590);
|
||||
}
|
||||
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm());
|
||||
JUT_ASSERT(811, anm != 0);
|
||||
JUT_ASSERT(811, anm != NULL);
|
||||
int rt = field_0x588->init(anm, 1, 0, 1.0f, 0, -1, true);
|
||||
JUT_ASSERT(813, rt == 0);
|
||||
if (field_0x59b != 0) {
|
||||
@@ -665,7 +665,7 @@ int daBdoorL1_c::openEnd() {
|
||||
/* 804E3850-804E3A2C 001B30 01DC+00 1/1 0/0 0/0 .text closeInit__11daBdoorL1_cFv */
|
||||
int daBdoorL1_c::closeInit() {
|
||||
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getCloseAnm());
|
||||
JUT_ASSERT(1020, anm != 0);
|
||||
JUT_ASSERT(1020, anm != NULL);
|
||||
int rt = field_0x588->init(anm, 1, 0, 1.0f, 0, -1, true);
|
||||
JUT_ASSERT(1022, rt == 0);
|
||||
switch(getNowLevel()) {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
// Boss Door Level 5
|
||||
//
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_door_bossL5.h"
|
||||
#include "d/actor/d_a_obj_keyhole.h"
|
||||
@@ -88,14 +88,14 @@ static char* action_table[14] = {
|
||||
/* 80670D10-80670EC0 000150 01B0+00 1/1 0/0 0/0 .text CreateHeap__11daBdoorL5_cFv */
|
||||
int daBdoorL5_c::CreateHeap() {
|
||||
J3DModelData* modelData = getDoorModelData();
|
||||
JUT_ASSERT(313, modelData != 0);
|
||||
JUT_ASSERT(313, modelData != NULL);
|
||||
field_0x580 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (field_0x580 == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm());
|
||||
JUT_ASSERT(354, anm != 0);
|
||||
JUT_ASSERT(354, anm != NULL);
|
||||
field_0x584 = new mDoExt_bckAnm();
|
||||
if (field_0x584 == NULL || !field_0x584->init(anm, 1, 0, 1.0f, 0, -1, false)) {
|
||||
return 0;
|
||||
@@ -265,7 +265,7 @@ void daBdoorL5_c::demoProc() {
|
||||
int daBdoorL5_c::openInit() {
|
||||
dComIfG_Bgsp().Release(field_0x588);
|
||||
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm());
|
||||
JUT_ASSERT(454, anm != 0);
|
||||
JUT_ASSERT(454, anm != NULL);
|
||||
int rt = field_0x584->init(anm, 1, 0, 1.0f, 0, -1, true);
|
||||
JUT_ASSERT(456, rt == 0);
|
||||
return 1;
|
||||
@@ -288,7 +288,7 @@ int daBdoorL5_c::openEnd() {
|
||||
/* 80671720-806717FC 000B60 00DC+00 1/1 0/0 0/0 .text closeInit__11daBdoorL5_cFv */
|
||||
int daBdoorL5_c::closeInit() {
|
||||
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getCloseAnm());
|
||||
JUT_ASSERT(511, anm != 0);
|
||||
JUT_ASSERT(511, anm != NULL);
|
||||
int rt = field_0x584->init(anm, 1, 0, 1.0f, 0, -1, true);
|
||||
JUT_ASSERT(513, rt == 0);
|
||||
mDoAud_seStart(Z2SE_OBJ_LV3_SHTR_CL, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
// d_a_door_dbdoor00
|
||||
//
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_door_dbdoor00.h"
|
||||
#include "printf.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
// Door Knob
|
||||
//
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_door_knob00.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
@@ -84,7 +84,7 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) {
|
||||
/* 8045E960-8045EBA0 000180 0240+00 1/1 0/0 0/0 .text CreateHeap__10daKnob20_cFv */
|
||||
int daKnob20_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(getAlwaysArcName(), getDummyBmd());
|
||||
JUT_ASSERT(201, modelData != 0);
|
||||
JUT_ASSERT(201, modelData != NULL);
|
||||
mModel1 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
|
||||
if (mModel1 == NULL) {
|
||||
return 0;
|
||||
@@ -95,14 +95,14 @@ int daKnob20_c::CreateHeap() {
|
||||
mModel1->setBaseTRMtx(mDoMtx_stack_c::get());
|
||||
J3DAnmTransform* anm =
|
||||
(J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), "FDoorA.bck");
|
||||
JUT_ASSERT(222, anm != 0);
|
||||
JUT_ASSERT(222, anm != NULL);
|
||||
if (field_0x57c.init(anm, 1, 0, 1.0f, 0, -1, false) == 0) {
|
||||
return 0;
|
||||
}
|
||||
mJoint = modelData->getJointName()->getIndex("FDoor");
|
||||
JUT_ASSERT(227, mJoint >= 0);
|
||||
modelData = getDoorModelData();
|
||||
JUT_ASSERT(235, modelData != 0);
|
||||
JUT_ASSERT(235, modelData != NULL);
|
||||
mModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (mModel2 == 0) {
|
||||
return 0;
|
||||
@@ -115,7 +115,7 @@ int daKnob20_c::CreateHeap() {
|
||||
field_0x57c.entry(mModel1->getModelData());
|
||||
mModel1->calc();
|
||||
cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb());
|
||||
JUT_ASSERT(261, bgd != 0);
|
||||
JUT_ASSERT(261, bgd != NULL);
|
||||
if (field_0x5a0->Set(bgd, 1, (Mtx*)mModel1->getAnmMtx(mJoint)) == 1) {
|
||||
return 0;
|
||||
} else {
|
||||
@@ -503,7 +503,7 @@ static char* bck_table[4] = {
|
||||
int daKnob20_c::openInit(int param_1) {
|
||||
J3DAnmTransform* anm =
|
||||
(J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), bck_table[param_1]);
|
||||
JUT_ASSERT(937, anm != 0);
|
||||
JUT_ASSERT(937, anm != NULL);
|
||||
field_0x57c.init(anm, 1, 0, 1.0f, 0, -1, true);
|
||||
onFlag(1);
|
||||
if (param_1 >= 2) {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_door_mbossL1.h"
|
||||
#include "d/actor/d_a_obj_stopper.h"
|
||||
@@ -205,7 +205,7 @@ void dDoor_stop2_c::draw(fopAc_ac_c* param_1) {
|
||||
f32 dDoor_stop2_c::getHeight() {
|
||||
if (mModel != NULL) {
|
||||
J3DJoint* root_jnt = mModel->getModelData()->getJointNodePointer(0);
|
||||
JUT_ASSERT(360, root_jnt != 0);
|
||||
JUT_ASSERT(360, root_jnt != NULL);
|
||||
return root_jnt->getMax()->y;
|
||||
}
|
||||
return 300.0f;
|
||||
@@ -325,7 +325,7 @@ J3DModelData* daMBdoorL1_c::getDoorModelData() {
|
||||
int daMBdoorL1_c::CreateHeap() {
|
||||
int level = getNowLevel(this);
|
||||
J3DModelData* modelData = getDoorModelData();
|
||||
JUT_ASSERT(579, modelData != 0);
|
||||
JUT_ASSERT(579, modelData != NULL);
|
||||
if (getDoorType() == DOOR_TYPE_2) {
|
||||
for (int i = 0; i < 2; i++) {
|
||||
mModels[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
@@ -334,7 +334,7 @@ int daMBdoorL1_c::CreateHeap() {
|
||||
}
|
||||
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(
|
||||
getAlwaysArcName(), "FDoorA.bck");
|
||||
JUT_ASSERT(597, anm != 0);
|
||||
JUT_ASSERT(597, anm != NULL);
|
||||
mBckAnms[i] = new mDoExt_bckAnm();
|
||||
if (mBckAnms[i] == NULL || !mBckAnms[i]->init(anm, 1, 0, 1.0f, 0, -1, false)) {
|
||||
return 0;
|
||||
@@ -355,7 +355,7 @@ int daMBdoorL1_c::CreateHeap() {
|
||||
}
|
||||
J3DAnmTransform* anm =
|
||||
(J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm());
|
||||
JUT_ASSERT(628, anm != 0);
|
||||
JUT_ASSERT(628, anm != NULL);
|
||||
mBckAnms[0] = new mDoExt_bckAnm();
|
||||
if (mBckAnms[0] == NULL || !mBckAnms[0]->init(anm, 1, 0, 1.0f, 0, -1, false)) {
|
||||
return 0;
|
||||
@@ -365,7 +365,7 @@ int daMBdoorL1_c::CreateHeap() {
|
||||
}
|
||||
if (level == 8) {
|
||||
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getStageRes(getBtk());
|
||||
JUT_ASSERT(646, pbtk != 0);
|
||||
JUT_ASSERT(646, pbtk != NULL);
|
||||
field_0x594 = new mDoExt_btkAnm();
|
||||
if (field_0x594 == NULL ||
|
||||
!field_0x594->init(mModels[0]->getModelData(), pbtk, 1, 0, 1.0f, 0, -1))
|
||||
@@ -375,7 +375,7 @@ int daMBdoorL1_c::CreateHeap() {
|
||||
}
|
||||
if (checkMakeStop()) {
|
||||
J3DModelData* mdl = (J3DModelData*)dComIfG_getStageRes("door-stop.bmd");
|
||||
JUT_ASSERT(671, mdl != 0);
|
||||
JUT_ASSERT(671, mdl != NULL);
|
||||
if (!mDoorStop.create(mdl)) {
|
||||
return 0;
|
||||
}
|
||||
@@ -955,7 +955,7 @@ int daMBdoorL1_c::openInit() {
|
||||
dComIfG_Bgsp().Release(field_0x598);
|
||||
}
|
||||
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm());
|
||||
JUT_ASSERT(1550, anm != 0);
|
||||
JUT_ASSERT(1550, anm != NULL);
|
||||
int rt = mBckAnms[0]->init(anm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true);
|
||||
JUT_ASSERT(1552, rt == 0);
|
||||
int level = getNowLevel(this);
|
||||
@@ -1068,7 +1068,7 @@ int daMBdoorL1_c::closeInit() {
|
||||
smokeInit2();
|
||||
}
|
||||
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getCloseAnm());
|
||||
JUT_ASSERT(1762, anm != 0);
|
||||
JUT_ASSERT(1762, anm != NULL);
|
||||
int rt = mBckAnms[0]->init(anm, 1, 0, 1.0f, 0, -1, true);
|
||||
JUT_ASSERT(1764, rt != 0);
|
||||
return 1;
|
||||
@@ -1120,7 +1120,7 @@ int daMBdoorL1_c::openInitKnob(int param_1) {
|
||||
};
|
||||
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(
|
||||
getAlwaysArcName(), bck_table[param_1]);
|
||||
JUT_ASSERT(1847, anm != 0);
|
||||
JUT_ASSERT(1847, anm != NULL);
|
||||
if ((field_0x5df == 0 && param_1 == 0) || (field_0x5df == 1 && param_1 == 2)) {
|
||||
field_0x590 = mBckAnms[0];
|
||||
} else if ((field_0x5df == 1 && param_1 == 0) || (field_0x5df == 0 && param_1 == 2)) {
|
||||
@@ -1331,7 +1331,7 @@ void daMBdoorL1_c::setStart(f32 param_1, f32 param_2) {
|
||||
|
||||
static f32 dummy(f32 param_0) {
|
||||
dBgS_ObjGndChk gnd_chk;
|
||||
return param_0 + -1e9f + 50.0f;
|
||||
return param_0 + -G_CM3D_F_INF + 50.0f;
|
||||
}
|
||||
|
||||
/* 80676004-806760B4 003844 00B0+00 1/1 0/0 0/0 .text smokeInit2__12daMBdoorL1_cFv */
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Door - Push
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_door_push.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
// Door Shutter
|
||||
//
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_door_shutter.h"
|
||||
#include "d/actor/d_a_obj_Lv5Key.h"
|
||||
@@ -114,7 +114,7 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) {
|
||||
int daDoor20_c::CreateHeap() {
|
||||
int kind = door_param2_c::getKind(this);
|
||||
J3DModelData* modelData = getModelData();
|
||||
JUT_ASSERT(355, modelData != 0);
|
||||
JUT_ASSERT(355, modelData != NULL);
|
||||
int dListFlag = 0x11000084;
|
||||
if (kind == 2) {
|
||||
dListFlag |= 0x200;
|
||||
@@ -136,7 +136,7 @@ int daDoor20_c::CreateHeap() {
|
||||
return 0;
|
||||
}
|
||||
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), "FDoorA.bck");
|
||||
JUT_ASSERT(394, anm != 0);
|
||||
JUT_ASSERT(394, anm != NULL);
|
||||
if (!field_0x5a0.init(anm, 1, 0, 1.0f, 0, -1, false)) {
|
||||
return 0;
|
||||
}
|
||||
@@ -159,7 +159,7 @@ int daDoor20_c::CreateHeap() {
|
||||
break;
|
||||
case 2:
|
||||
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getStageRes(getBtk());
|
||||
JUT_ASSERT(421, pbtk != 0);
|
||||
JUT_ASSERT(421, pbtk != NULL);
|
||||
field_0x5c0 = new mDoExt_btkAnm();
|
||||
if (field_0x5c0 == NULL || !field_0x5c0->init(mModel1->getModelData(), pbtk, 1, 0, 1.0f, 0, -1)) {
|
||||
return 0;
|
||||
@@ -170,7 +170,7 @@ int daDoor20_c::CreateHeap() {
|
||||
anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpF.bck");
|
||||
break;
|
||||
}
|
||||
JUT_ASSERT(375, anm != 0);
|
||||
JUT_ASSERT(375, anm != NULL);
|
||||
if (field_0x584.init(anm, 1, 0, 1.0f, 0, -1, false) == 0) {
|
||||
return 0;
|
||||
}
|
||||
@@ -419,7 +419,7 @@ void daDoor20_c::openInit_0() {
|
||||
anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpD.bck");
|
||||
}
|
||||
}
|
||||
JUT_ASSERT(832, anm != 0);
|
||||
JUT_ASSERT(832, anm != NULL);
|
||||
int rt = field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true);
|
||||
JUT_ASSERT(835, rt == 0);
|
||||
daPy_py_c* player = daPy_getPlayerActorClass();
|
||||
@@ -451,7 +451,7 @@ void daDoor20_c::openInit_1() {
|
||||
} else {
|
||||
anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpC.bck");
|
||||
}
|
||||
JUT_ASSERT(915, anm != 0);
|
||||
JUT_ASSERT(915, anm != NULL);
|
||||
int rt = field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true);
|
||||
JUT_ASSERT(918, rt == 0);
|
||||
u8 bVar5 = door_param2_c::getSwbit3(this);
|
||||
@@ -600,7 +600,7 @@ void daDoor20_c::closeInit_0() {
|
||||
} else {
|
||||
anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorCloseD.bck");
|
||||
}
|
||||
JUT_ASSERT(1178, anm != 0);
|
||||
JUT_ASSERT(1178, anm != NULL);
|
||||
int rt = field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true);
|
||||
JUT_ASSERT(1181, rt == 0);
|
||||
cXyz acStack_40(home.pos.x, home.pos.y + 200.0f, home.pos.z);
|
||||
@@ -629,7 +629,7 @@ void daDoor20_c::closeInit_0() {
|
||||
void daDoor20_c::closeInit_1() {
|
||||
J3DAnmTransform* anm =
|
||||
(J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorCloseC.bck");
|
||||
JUT_ASSERT(1236, anm != 0);
|
||||
JUT_ASSERT(1236, anm != NULL);
|
||||
int rt = field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true);
|
||||
JUT_ASSERT(1239, rt == 0);
|
||||
mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_ROLLCLOSE, ¤t.pos, 0,
|
||||
@@ -929,7 +929,7 @@ int daDoor20_c::demoProc() {
|
||||
case 13:
|
||||
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(
|
||||
getAlwaysArcName(), "FDoorB.bck");
|
||||
JUT_ASSERT(1796, anm != 0);
|
||||
JUT_ASSERT(1796, anm != NULL);
|
||||
if (!field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true) || !field_0x5a0.init(anm,
|
||||
1, 0, 1.0f, 0, -1, true))
|
||||
{
|
||||
@@ -941,7 +941,7 @@ int daDoor20_c::demoProc() {
|
||||
case 12:
|
||||
anm =
|
||||
(J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), "FDoorA.bck");
|
||||
JUT_ASSERT(1809, anm != 0);
|
||||
JUT_ASSERT(1809, anm != NULL);
|
||||
if (!field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true) || !field_0x5a0.init(anm,
|
||||
1, 0, 1.0f, 0, -1, true))
|
||||
{
|
||||
@@ -2201,7 +2201,7 @@ int dDoor_stop_c::openProc(daDoor20_c* i_this) {
|
||||
/* 804664E8-80466538 005A28 0050+00 1/1 0/0 0/0 .text create__12dDoor_stop_cFP10daDoor20_c */
|
||||
int dDoor_stop_c::create(daDoor20_c* i_this) {
|
||||
J3DModelData* stopModelData = i_this->getStopModelData();
|
||||
JUT_ASSERT(3923, stopModelData != 0);
|
||||
JUT_ASSERT(3923, stopModelData != NULL);
|
||||
field_0x0 = mDoExt_J3DModel__create(stopModelData, 0x80000, 0x11000084);
|
||||
return field_0x0 != NULL ? 1 : 0;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
// Door Spiral
|
||||
//
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_door_spiral.h"
|
||||
#include "f_op/f_op_actor.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Gates that shutter open / close
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_dshutter.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_ai.h"
|
||||
|
||||
@@ -885,7 +885,7 @@ static int daE_AI_Delete(e_ai_class* i_this) {
|
||||
/* 8067B6F0-8067B87C 002670 018C+00 1/1 0/0 0/0 .text CreateHeap__10e_ai_classFv */
|
||||
int e_ai_class::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_AI", 0xD);
|
||||
JUT_ASSERT(1703, modelData != 0);
|
||||
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);
|
||||
if (m_modelMorf == NULL || m_modelMorf->getModel() == NULL) {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Enemy Arrow
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_arrow.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
@@ -668,7 +668,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
|
||||
}
|
||||
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(a_this->mResName, res_id);
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
JUT_ASSERT(0, modelData != NULL);
|
||||
|
||||
a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (a_this->mpModel == NULL) {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Enemy - Keese
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_ba.h"
|
||||
#include "JSystem/JKernel/JKRHeap.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Enemy - Bees
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_bee.h"
|
||||
#include "d/actor/d_a_e_nest.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_bg.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
@@ -340,7 +340,7 @@ void daE_BG_c::executeSwim() {
|
||||
{
|
||||
if (!fopAcM_otherBgCheck(this, daPy_getPlayerActorClass())) {
|
||||
if (daPy_getPlayerActorClass()->checkEquipHeavyBoots()) {
|
||||
if (field_0x684 != -1e+09f) {
|
||||
if (field_0x684 != -G_CM3D_F_INF) {
|
||||
if (daPy_getPlayerActorClass()->current.pos.y < field_0x684 - 20.0f) {
|
||||
setActionMode(2, 0);
|
||||
return;
|
||||
@@ -365,7 +365,7 @@ void daE_BG_c::executeSwim() {
|
||||
switch (mMoveMode) {
|
||||
case 0: {
|
||||
field_0x660.y = home.pos.y + cM_rndFX(500.0f);
|
||||
if (field_0x684 != -1e+09f && field_0x660.y > field_0x684 - 50.0f) {
|
||||
if (field_0x684 != -G_CM3D_F_INF && field_0x660.y > field_0x684 - 50.0f) {
|
||||
field_0x660.y = field_0x684 - 50.0f;
|
||||
}
|
||||
|
||||
@@ -409,7 +409,7 @@ void daE_BG_c::executeSwim() {
|
||||
|
||||
cLib_addCalcAngleS(&field_0x6a0, 0xc00, 8, 0x400, 0x100);
|
||||
|
||||
if (speed.y > 0.0f && field_0x684 != -1e+09f && current.pos.y > field_0x684 - 50.0f) {
|
||||
if (speed.y > 0.0f && field_0x684 != -G_CM3D_F_INF && current.pos.y > field_0x684 - 50.0f) {
|
||||
mMoveMode = 3;
|
||||
}
|
||||
|
||||
@@ -463,7 +463,7 @@ void daE_BG_c::executeAttack() {
|
||||
|
||||
if (mMoveMode <= 2) {
|
||||
if (daPy_getPlayerActorClass()->checkEquipHeavyBoots()) {
|
||||
if (field_0x684 != -1e+09f && playerPos.y >= field_0x684 - 20.0f) {
|
||||
if (field_0x684 != -G_CM3D_F_INF && playerPos.y >= field_0x684 - 20.0f) {
|
||||
setActionMode(1, 0);
|
||||
return;
|
||||
}
|
||||
@@ -966,7 +966,7 @@ void daE_BG_c::executeEat() {
|
||||
switch (this->mMoveMode) {
|
||||
case 0:
|
||||
field_0x660.y = rodPos.y + cM_rndFX(100.0f);
|
||||
if (field_0x684 != -1e+09f && field_0x660.y > field_0x684 - 50.0f) {
|
||||
if (field_0x684 != -G_CM3D_F_INF && field_0x660.y > field_0x684 - 50.0f) {
|
||||
field_0x660.y = field_0x684 - 50.0f;
|
||||
}
|
||||
|
||||
@@ -1164,7 +1164,7 @@ void daE_BG_c::action() {
|
||||
|
||||
fopAcM_posMoveF(this, mStts.GetCCMoveP());
|
||||
|
||||
if (field_0x684 != -1e+09f && current.pos.y > field_0x684 - 50.0f) {
|
||||
if (field_0x684 != -G_CM3D_F_INF && current.pos.y > field_0x684 - 50.0f) {
|
||||
current.pos.y = field_0x684 - 50.0f;
|
||||
if (speed.y > 0.0f) {
|
||||
speed.y = 0.0f;
|
||||
@@ -1323,7 +1323,7 @@ static int daE_BG_Delete(daE_BG_c* i_this) {
|
||||
/* 80689A0C-80689BD0 0042EC 01C4+00 1/1 0/0 0/0 .text CreateHeap__8daE_BG_cFv */
|
||||
int daE_BG_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_BG", 10);
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
JUT_ASSERT(0, modelData != NULL);
|
||||
|
||||
mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL,
|
||||
(J3DAnmTransform*)dComIfG_getObjectRes("E_BG", 7), 0, 1.0f, 0,
|
||||
@@ -1426,7 +1426,7 @@ int daE_BG_c::create() {
|
||||
gndChkSpl.SetPos(&gndChkPos);
|
||||
|
||||
field_0x684 = dComIfG_Bgsp().GroundCross(&gndChkSpl);
|
||||
if (field_0x684 != -1e+09f && current.pos.y > field_0x684 - 50.0f) {
|
||||
if (field_0x684 != -G_CM3D_F_INF && current.pos.y > field_0x684 - 50.0f) {
|
||||
current.pos.y = field_0x684 - 50.0f;
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_bi.h"
|
||||
#include "d/d_cc_d.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_bi_leaf.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -88,7 +88,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
|
||||
|
||||
if (a_this->field_0x5b4 != 1) {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_BI", 15);
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
JUT_ASSERT(0, modelData != NULL);
|
||||
|
||||
a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (a_this->mpModel == NULL) {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_bs.h"
|
||||
#include "f_op/f_op_actor_enemy.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_bu.h"
|
||||
#include "f_op/f_op_actor_enemy.h"
|
||||
@@ -549,7 +549,7 @@ static void e_bu_path_fly(e_bu_class* i_this) {
|
||||
int next_path_id = i_this->ppd->m_nextID;
|
||||
if (next_path_id != 0xFFFF) {
|
||||
i_this->ppd = dPath_GetRoomPath(next_path_id, fopAcM_GetRoomNo(actor));
|
||||
JUT_ASSERT(919, i_this->ppd != 0);
|
||||
JUT_ASSERT(919, i_this->ppd != NULL);
|
||||
}
|
||||
} else if (i_this->now_path_pntNo < 0) {
|
||||
i_this->path_step = 1;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_bug.h"
|
||||
#include "d/actor/d_a_player.h"
|
||||
@@ -814,10 +814,10 @@ static int useHeapInit(fopAc_ac_c* a_this) {
|
||||
e_bug_class* i_this = (e_bug_class*)a_this;
|
||||
|
||||
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("E_bug", BMDG_MU04));
|
||||
JUT_ASSERT(1322, modelData != 0);
|
||||
JUT_ASSERT(1322, modelData != NULL);
|
||||
|
||||
J3DModelData* modelData2 = static_cast<J3DModelData*>(dComIfG_getObjectRes("E_bug", BMDG_MU05));
|
||||
JUT_ASSERT(1327, modelData2 != 0);
|
||||
JUT_ASSERT(1327, modelData2 != NULL);
|
||||
|
||||
for (int i = 0; i < i_this->bug_num; i++) {
|
||||
i_this->Bug_s[i].field_0x0 = mDoExt_J3DModel__create(modelData, 0x20000, 0x11000084);
|
||||
@@ -908,7 +908,7 @@ static cPhs__Step daE_Bug_Create(fopAc_ac_c* a_this) {
|
||||
static u32 const l_bmdidx[2] = {BMDG_MU04, BMDG_MU05};
|
||||
for (u32 i = 0; i < 2; i++) {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_bug", l_bmdidx[i]);
|
||||
JUT_ASSERT(1476, modelData != 0);
|
||||
JUT_ASSERT(1476, modelData != NULL);
|
||||
|
||||
if (dComIfGp_addSimpleModel(modelData, fopAcM_GetRoomNo(a_this), 0) == -1) {
|
||||
OS_REPORT("1Bh[43;30m虫の集団:シンプルモデル登録失敗しました。\n1Bh[m"); // 1Bh, group of insects: Simple model registration failed.
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_cr.h"
|
||||
#include "d/d_cc_d.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_cr_egg.h"
|
||||
#include "d/d_cc_d.h"
|
||||
@@ -159,7 +159,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
|
||||
e_cr_egg_class* a_this = (e_cr_egg_class*)i_this;
|
||||
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_CR", 0xC);
|
||||
JUT_ASSERT(374, modelData != 0);
|
||||
JUT_ASSERT(374, modelData != NULL);
|
||||
|
||||
a_this->model = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (a_this->model == NULL) {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_db.h"
|
||||
#include "d/actor/d_a_e_db_leaf.h"
|
||||
@@ -2080,7 +2080,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
|
||||
}
|
||||
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_db", 0x19);
|
||||
JUT_ASSERT(3622, modelData != 0);
|
||||
JUT_ASSERT(3622, modelData != NULL);
|
||||
|
||||
for (int i = 1; i < 11; i++) {
|
||||
if (i & 1) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// Translation Unit: d_a_e_db_leaf
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_db_leaf.h"
|
||||
#include "d/d_procname.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_dd.h"
|
||||
#include "d/d_cc_d.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_df.h"
|
||||
#include "d/actor/d_a_obj_carry.h"
|
||||
@@ -39,7 +39,7 @@ daE_DF_HIO_c::daE_DF_HIO_c() {
|
||||
/* 806A7710-806A7808 000110 00F8+00 1/1 0/0 0/0 .text CreateHeap__8daE_DF_cFv */
|
||||
int daE_DF_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_DF", 0xD);
|
||||
JUT_ASSERT(161, modelData != 0);
|
||||
JUT_ASSERT(161, modelData != NULL);
|
||||
|
||||
mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL,
|
||||
(J3DAnmTransform*)dComIfG_getObjectRes("E_DF", 10), 2, 1.0f, 0,
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_dk.h"
|
||||
#include "d/actor/d_a_player.h"
|
||||
@@ -281,7 +281,7 @@ void daE_DK_c::checkWaterHeight() {
|
||||
gndChkPos.y += 1000.0f;
|
||||
gndChk.SetPos(&gndChkPos);
|
||||
field_0x6b8 = dComIfG_Bgsp().GroundCross(&gndChk);
|
||||
if (field_0x6b8 != -1000000000.0f && current.pos.y + 350.0f > field_0x6b8) {
|
||||
if (field_0x6b8 != -G_CM3D_F_INF && current.pos.y + 350.0f > field_0x6b8) {
|
||||
current.pos.y = field_0x6b8 - 350.0f;
|
||||
}
|
||||
} else {
|
||||
@@ -289,7 +289,7 @@ void daE_DK_c::checkWaterHeight() {
|
||||
gndChkPos.y += 1000.0f;
|
||||
gndChk.SetPos(&gndChkPos);
|
||||
field_0x6b8 = dComIfG_Bgsp().GroundCross(&gndChk);
|
||||
if (field_0x6b8 != -1000000000.0f && field_0x670.y + 350.0f > field_0x6b8) {
|
||||
if (field_0x6b8 != -G_CM3D_F_INF && field_0x670.y + 350.0f > field_0x6b8) {
|
||||
field_0x670.y = field_0x6b8 - 350.0f;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_dn.h"
|
||||
#include "d/d_cc_d.h"
|
||||
@@ -2812,14 +2812,14 @@ static void action(e_dn_class* i_this) {
|
||||
gnd_chk.SetPos(&sp264);
|
||||
sp264.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
|
||||
|
||||
if (sp264.y != -1000000000.0f) {
|
||||
if (sp264.y != -G_CM3D_F_INF) {
|
||||
sp258.x = sp264.x;
|
||||
sp258.y = sp264.y + 100.0f;
|
||||
sp258.z = sp264.z + fVar1;
|
||||
gnd_chk.SetPos(&sp258);
|
||||
sp258.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
|
||||
|
||||
if (sp258.y != -1000000000.0f) {
|
||||
if (sp258.y != -G_CM3D_F_INF) {
|
||||
sVar7 = -cM_atan2s(sp258.y - sp264.y, sp258.z - sp264.z);
|
||||
if (sVar7 > 0x3000 || sVar7 < -0x3000) {
|
||||
sVar7 = 0;
|
||||
@@ -2831,7 +2831,7 @@ static void action(e_dn_class* i_this) {
|
||||
sp258.z = sp264.z;
|
||||
gnd_chk.SetPos(&sp258);
|
||||
sp258.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
|
||||
if (sp258.y != -1000000000.0f) {
|
||||
if (sp258.y != -G_CM3D_F_INF) {
|
||||
sVar6 = cM_atan2s(sp258.y - sp264.y, sp258.x - sp264.x);
|
||||
if (sVar6 > 0x3000 || sVar6 < -0x3000) {
|
||||
sVar6 = 0;
|
||||
@@ -3302,14 +3302,14 @@ static int useHeapInit(fopAc_ac_c* a_this) {
|
||||
}
|
||||
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_dn", 39);
|
||||
JUT_ASSERT(5420, modelData != 0);
|
||||
JUT_ASSERT(5420, modelData != NULL);
|
||||
i_this->mpKnifeModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (i_this->mpKnifeModel == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("E_dn", 41);
|
||||
JUT_ASSERT(5432, modelData != 0);
|
||||
JUT_ASSERT(5432, modelData != NULL);
|
||||
i_this->mpShieldModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (i_this->mpShieldModel == NULL) {
|
||||
return 0;
|
||||
@@ -3317,7 +3317,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
|
||||
|
||||
if (i_this->field_0x5b7 == 1) {
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("E_dn", 40);
|
||||
JUT_ASSERT(5443, modelData != 0);
|
||||
JUT_ASSERT(5443, modelData != NULL);
|
||||
i_this->mpSkullModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (i_this->mpSkullModel == NULL) {
|
||||
return 0;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_dt.h"
|
||||
#include "JSystem/J3DGraphBase/J3DMaterial.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_fb.h"
|
||||
#include "dol2asm.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_fk.h"
|
||||
#include "d/d_s_play.h"
|
||||
@@ -38,7 +38,7 @@ daE_FK_HIO_c::daE_FK_HIO_c() {
|
||||
/* 806B93CC-806B9514 00012C 0148+00 1/1 0/0 0/0 .text CreateHeap__8daE_FK_cFv */
|
||||
int daE_FK_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_fk", 15);
|
||||
JUT_ASSERT(189, modelData != 0);
|
||||
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);
|
||||
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
|
||||
return 0;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_fm.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -3595,7 +3595,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
|
||||
}
|
||||
|
||||
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("E_fm", BMDE_FM_CORE));
|
||||
JUT_ASSERT(7257, modelData != 0);
|
||||
JUT_ASSERT(7257, modelData != NULL);
|
||||
a_this->mpCoreModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
|
||||
if (a_this->mpCoreModel == NULL) {
|
||||
return 0;
|
||||
@@ -3659,10 +3659,10 @@ static int useHeapInit(fopAc_ac_c* i_this) {
|
||||
}
|
||||
|
||||
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("E_fm", BMDR_KUSARI));
|
||||
JUT_ASSERT(7404, modelData != 0);
|
||||
JUT_ASSERT(7404, modelData != NULL);
|
||||
|
||||
J3DModelData* modelData2 = static_cast<J3DModelData*>(dComIfG_getObjectRes("E_fm", BMDR_HANDLE));
|
||||
JUT_ASSERT(7408, modelData2 != 0);
|
||||
JUT_ASSERT(7408, modelData2 != NULL);
|
||||
|
||||
for (int i = 0; i < 4; i++) {
|
||||
for (int j = 0; j < 26; j++) {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Enemy - Puppet
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_fs.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* @brief Enemy - Mini Freezard
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_fz.h"
|
||||
#include "f_op/f_op_actor_enemy.h"
|
||||
@@ -377,7 +377,7 @@ bool daE_FZ_c::way_gake_check() {
|
||||
gnd_chk.SetPos(&field_0x6e8);
|
||||
|
||||
field_0x6e8.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
|
||||
if (field_0x6e8.y == -1e+09f) {
|
||||
if (field_0x6e8.y == -G_CM3D_F_INF) {
|
||||
field_0x6e8.y = current.pos.y;
|
||||
return true;
|
||||
} else if (current.pos.y - field_0x6e8.y > 100.0f) {
|
||||
@@ -782,7 +782,7 @@ void daE_FZ_c::action() {
|
||||
gnd_chk.SetPos(&pos);
|
||||
pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
|
||||
|
||||
if (pos.y != -1e+09f) {
|
||||
if (pos.y != -G_CM3D_F_INF) {
|
||||
field_0x710 = 0;
|
||||
|
||||
if (current.pos.y - pos.y > 400.0f && field_0x713 == 0) {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_ga.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -185,7 +185,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
|
||||
e_ga_class* a_this = (e_ga_class*)i_this;
|
||||
|
||||
void* modelData = dComIfG_getObjectRes("E_Ga", 3);
|
||||
JUT_ASSERT(450, modelData != 0);
|
||||
JUT_ASSERT(450, modelData != NULL);
|
||||
|
||||
for (int i = 0; i < a_this->ga_num; i++) {
|
||||
a_this->ga_s[i].model = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x20000, 0x11000084);
|
||||
@@ -255,7 +255,7 @@ static int daE_Ga_Create(fopAc_ac_c* i_this) {
|
||||
daE_Ga_Execute(a_this);
|
||||
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_ga", 3);
|
||||
JUT_ASSERT(536, modelData != 0);
|
||||
JUT_ASSERT(536, modelData != NULL);
|
||||
|
||||
if (dComIfGp_addSimpleModel(modelData, fopAcM_GetRoomNo(i_this), FALSE) == -1) {
|
||||
// "Moth: Simple Model addition failed.\n"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_gb.h"
|
||||
#include "d/d_cc_d.h"
|
||||
@@ -1556,7 +1556,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
|
||||
i_this->mBrkAnm->setPlaySpeed(0.0f);
|
||||
|
||||
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("E_gb", 32));
|
||||
JUT_ASSERT(3378, modelData != 0);
|
||||
JUT_ASSERT(3378, modelData != NULL);
|
||||
|
||||
for (int i = 0; i < 18; i++) {
|
||||
i_this->field_0x828[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
@@ -1569,7 +1569,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
|
||||
|
||||
if (strcmp(dComIfGp_getStartStageName(), "D_MN05") == 0) {
|
||||
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("E_gb", 30));
|
||||
JUT_ASSERT(3395, modelData != 0);
|
||||
JUT_ASSERT(3395, modelData != NULL);
|
||||
i_this->field_0x66c = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (i_this->field_0x66c == NULL) {
|
||||
return 0;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Enemy - Guay
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_ge.h"
|
||||
#include "d/d_cc_d.h"
|
||||
@@ -1007,7 +1007,7 @@ COMPILER_STRIP_GATE(0x806CD104, &lit_5842);
|
||||
/* 806CD108-806CD10C 000108 0004+00 0/1 0/0 0/0 .rodata @5843 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_5843 = -1000000000.0f;
|
||||
SECTION_RODATA static f32 const lit_5843 = -G_CM3D_F_INF;
|
||||
COMPILER_STRIP_GATE(0x806CD108, &lit_5843);
|
||||
#pragma pop
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_gi.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -342,7 +342,7 @@ void daE_GI_c::setDragSwordEffect() {
|
||||
gndchk.SetPos(&pos);
|
||||
|
||||
f32 ground_height = dComIfG_Bgsp().GroundCross(&gndchk);
|
||||
if (-1000000000.0f != ground_height) {
|
||||
if (-G_CM3D_F_INF != ground_height) {
|
||||
pos.y = ground_height;
|
||||
}
|
||||
|
||||
@@ -1025,7 +1025,7 @@ static int daE_GI_Delete(daE_GI_c* a_this) {
|
||||
/* 806D00E8-806D025C 002D48 0174+00 1/1 0/0 0/0 .text CreateHeap__8daE_GI_cFv */
|
||||
int daE_GI_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_GI", 0x13);
|
||||
JUT_ASSERT(1621, modelData != 0);
|
||||
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);
|
||||
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
|
||||
@@ -1042,7 +1042,7 @@ int daE_GI_c::CreateHeap() {
|
||||
}
|
||||
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("E_GI", 0x14);
|
||||
JUT_ASSERT(1652, modelData != 0);
|
||||
JUT_ASSERT(1652, modelData != NULL);
|
||||
mpSwordModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084);
|
||||
if (mpSwordModel == NULL) {
|
||||
return 0;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_gm.h"
|
||||
#include "f_op/f_op_actor_enemy.h"
|
||||
@@ -1713,7 +1713,7 @@ int daE_GM_c::CreateHeap() {
|
||||
if (mType == TYPE_GOMA) {
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("E_mg", BMDV_MD);
|
||||
|
||||
JUT_ASSERT(2683, modelData != 0);
|
||||
JUT_ASSERT(2683, modelData != NULL);
|
||||
|
||||
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mg", 9),
|
||||
0, 1.0f, 0, -1, &mSound, 0, 0x11000084);
|
||||
@@ -1721,7 +1721,7 @@ int daE_GM_c::CreateHeap() {
|
||||
if (mType != TYPE_NORMAL) {
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("E_gm", BMDE_GOMA_EGG);
|
||||
|
||||
JUT_ASSERT(2701, modelData != 0);
|
||||
JUT_ASSERT(2701, modelData != NULL);
|
||||
|
||||
mpEggModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084);
|
||||
if (mpEggModel == NULL) {
|
||||
@@ -1731,7 +1731,7 @@ int daE_GM_c::CreateHeap() {
|
||||
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("E_gm", BMDV_GB);
|
||||
|
||||
JUT_ASSERT(2714, modelData != 0);
|
||||
JUT_ASSERT(2714, modelData != NULL);
|
||||
|
||||
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_gm", BCK_GB_APPEAR),
|
||||
0, 1.0f, 0, -1, &mSound, 0, 0x11000084);
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_gob.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -1584,14 +1584,14 @@ static void action(e_gob_class* i_this) {
|
||||
sp7C.SetPos(&sp4C);
|
||||
|
||||
sp4C.y = dComIfG_Bgsp().GroundCross(&sp7C);
|
||||
if (-1000000000.0f != sp4C.y) {
|
||||
if (-G_CM3D_F_INF != sp4C.y) {
|
||||
sp58.x = sp4C.x;
|
||||
sp58.y = 50.0f + sp4C.y;
|
||||
sp58.z = sp4C.z + temp_f28;
|
||||
sp7C.SetPos(&sp58);
|
||||
|
||||
sp58.y = dComIfG_Bgsp().GroundCross(&sp7C);
|
||||
if (-1000000000.0f != sp58.y) {
|
||||
if (-G_CM3D_F_INF != sp58.y) {
|
||||
f32 var_f30 = sp58.y - sp4C.y;
|
||||
f32 var_f24 = sp58.z - sp4C.z;
|
||||
sp1A = -cM_atan2s(var_f30, var_f24);
|
||||
@@ -1606,7 +1606,7 @@ static void action(e_gob_class* i_this) {
|
||||
sp7C.SetPos(&sp58);
|
||||
|
||||
sp58.y = dComIfG_Bgsp().GroundCross(&sp7C);
|
||||
if (-1000000000.0f != sp58.y) {
|
||||
if (-G_CM3D_F_INF != sp58.y) {
|
||||
f32 var_f30 = sp58.y - sp4C.y;
|
||||
f32 var_f25 = sp58.x - sp4C.x;
|
||||
sp18 = (s16)cM_atan2s(var_f30, var_f25);
|
||||
@@ -2288,7 +2288,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
|
||||
}
|
||||
|
||||
void* modelData = dComIfG_getObjectRes("E_gob", BMDR_MG_MET);
|
||||
JUT_ASSERT(3631, modelData != 0);
|
||||
JUT_ASSERT(3631, modelData != NULL);
|
||||
a_this->mpArmorModel = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084);
|
||||
if (a_this->mpArmorModel == NULL) {
|
||||
return 0;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_gs.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_hb.h"
|
||||
#include "d/actor/d_a_e_hb_leaf.h"
|
||||
@@ -1384,7 +1384,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
|
||||
}
|
||||
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_hb", 0x19);
|
||||
JUT_ASSERT(3031, modelData != 0);
|
||||
JUT_ASSERT(3031, modelData != NULL);
|
||||
|
||||
for (int i = 1; i < 11; i++) {
|
||||
if (i & 1) {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_hb_leaf.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_hm.h"
|
||||
#include "dol2asm.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_e_hp.h"
|
||||
#include "d/actor/d_a_alink.h"
|
||||
@@ -830,7 +830,7 @@ void daE_HP_c::action() {
|
||||
}
|
||||
|
||||
daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
|
||||
if (mObjAcch.GetGroundH() != -1000000000.0f) {
|
||||
if (mObjAcch.GetGroundH() != -G_CM3D_F_INF) {
|
||||
if (arg0 != 2 || mAction == 5 || mAction == 6) {
|
||||
gravity = -3.0f;
|
||||
if ((mAction == 5 && field_0x780 == 9 || mAction == 6) && mObjAcch.ChkGroundHit()) {
|
||||
@@ -885,7 +885,7 @@ void daE_HP_c::action() {
|
||||
field_0x768 =
|
||||
field_0x7a4 + (20.0f + NREG_F(4)) * cM_ssin((f32)field_0x7a8 * (1000.0f + NREG_F(3)));
|
||||
|
||||
if (mObjAcch.GetGroundH() != -1000000000.0f) {
|
||||
if (mObjAcch.GetGroundH() != -G_CM3D_F_INF) {
|
||||
field_0x72c.y = mObjAcch.GetGroundH();
|
||||
}
|
||||
|
||||
@@ -1153,7 +1153,7 @@ static int daE_HP_Delete(daE_HP_c* i_this) {
|
||||
/* 806E9240-806E94FC 003540 02BC+00 1/1 0/0 0/0 .text CreateHeap__8daE_HP_cFv */
|
||||
int daE_HP_c::CreateHeap() {
|
||||
J3DModelData* modeldata = (J3DModelData*)dComIfG_getObjectRes("E_HP", 19);
|
||||
JUT_ASSERT(0x764, modeldata != 0)
|
||||
JUT_ASSERT(0x764, modeldata != NULL);
|
||||
mpMorfSO = new mDoExt_McaMorfSO(modeldata, NULL, NULL,
|
||||
(J3DAnmTransform*)dComIfG_getObjectRes("E_HP", 13), 2, 1.0f, 0,
|
||||
-1, &mSound1, 0x80000, 0x11000084);
|
||||
@@ -1175,7 +1175,7 @@ int daE_HP_c::CreateHeap() {
|
||||
}
|
||||
|
||||
modeldata = (J3DModelData*)dComIfG_getObjectRes("E_HP", 20);
|
||||
JUT_ASSERT(0x78b, modeldata != 0);
|
||||
JUT_ASSERT(0x78b, modeldata != NULL);
|
||||
|
||||
mpModel = mDoExt_J3DModel__create(modeldata, 0x80000, 0x11000084);
|
||||
if (mpModel == NULL) {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "Z2AudioLib/Z2Instances.h"
|
||||
#include "d/actor/d_a_e_hz.h"
|
||||
@@ -324,7 +324,7 @@ void daE_HZ_c::checkFall() {
|
||||
gnd_chk.SetPos(&modified_pos);
|
||||
|
||||
f32 ground_cross = dComIfG_Bgsp().GroundCross(&gnd_chk);
|
||||
if (speed.y < 0.0f && ground_cross != -1000000000.0f) {
|
||||
if (speed.y < 0.0f && ground_cross != -G_CM3D_F_INF) {
|
||||
s32 gnd_chk_ground_code = dComIfG_Bgsp().GetGroundCode(gnd_chk);
|
||||
if ((gnd_chk_ground_code == 4 || gnd_chk_ground_code == 10 || gnd_chk_ground_code == 5) &&
|
||||
ground_cross + 500.0f > current.pos.y)
|
||||
@@ -346,7 +346,7 @@ void daE_HZ_c::setCloseSmokeEffect() {
|
||||
modified_pos.y += 100.0f;
|
||||
|
||||
gnd_chk.SetPos(&modified_pos);
|
||||
if (dComIfG_Bgsp().GroundCross(&gnd_chk) != -1000000000.0f) {
|
||||
if (dComIfG_Bgsp().GroundCross(&gnd_chk) != -G_CM3D_F_INF) {
|
||||
dComIfGp_particle_setPolyColor(dPa_RM(ID_ZM_S_HAZIKIPLATESMOKE00), gnd_chk, &mSmokeEffectPosition, &tevStr,
|
||||
&shape_angle, NULL, 0, NULL, -1, NULL);
|
||||
}
|
||||
@@ -1905,7 +1905,7 @@ int daE_HZ_c::JointCallBack(J3DJoint* i_joint, int param_1) {
|
||||
/* 806EF8CC-806EFB34 0053AC 0268+00 1/1 0/0 0/0 .text CreateHeap__8daE_HZ_cFv */
|
||||
int daE_HZ_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_HZ", 0x16);
|
||||
JUT_ASSERT(2479, modelData != 0);
|
||||
JUT_ASSERT(2479, modelData != NULL);
|
||||
|
||||
mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL,
|
||||
(J3DAnmTransform*)dComIfG_getObjectRes("E_HZ", 0x10), 0, 1.0f,
|
||||
@@ -1921,7 +1921,7 @@ int daE_HZ_c::CreateHeap() {
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes(mpName, 3);
|
||||
}
|
||||
|
||||
JUT_ASSERT(2505, modelData != 0);
|
||||
JUT_ASSERT(2505, modelData != NULL);
|
||||
|
||||
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (mpModel == NULL) {
|
||||
@@ -1942,7 +1942,7 @@ int daE_HZ_c::CreateHeap() {
|
||||
mpBgW->SetCrrFunc(dBgS_MoveBGProc_Typical);
|
||||
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("E_HZ", 0x17);
|
||||
JUT_ASSERT(2532, modelData != 0);
|
||||
JUT_ASSERT(2532, modelData != NULL);
|
||||
|
||||
mpModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (mpModel2 == NULL) {
|
||||
@@ -1973,7 +1973,7 @@ void daE_HZ_c::setInitPos() {
|
||||
gnd_chk.SetPos(&modified_home_pos);
|
||||
|
||||
f32 ground_cross = dComIfG_Bgsp().GroundCross(&gnd_chk);
|
||||
if (ground_cross != -1000000000.0f) {
|
||||
if (ground_cross != -G_CM3D_F_INF) {
|
||||
home.pos.y = ground_cross;
|
||||
old.pos.y = ground_cross;
|
||||
current.pos.y = ground_cross;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user