mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-08 21:54:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Assert defines

Browse Source
This commit is contained in:
LagoLunatic
2025-07-15 15:22:51 -04:00
parent 7b010f07c7
commit 5f65dbaee1
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_canon.cpp
+1 -1
View File
@@ -128,7 +128,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
/* 000003F8-000004CC .text _createHeap__13daObj_Canon_cFv */
BOOL daObj_Canon_c::_createHeap() {
J3DModelData* modelData = (J3DModelData *)dComIfG_getObjectRes(m_arc_name, WALLBOM_BDL_WALLBOM);
JUT_ASSERT(0x115, modelData != 0);
JUT_ASSERT(0x115, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
#if VERSION > VERSION_DEMO
src/d/actor/d_a_player_main.cpp
+2 -2
View File
@@ -12109,7 +12109,7 @@ J3DModelData* daPy_lk_c::initModel(J3DModel** i_model, int i_fileIndex, u32 i_di
J3DAnmTextureSRTKey* daPy_lk_c::entryBtk(J3DModelData* param_1, int param_2) {
J3DAnmTextureSRTKey* btk_anm =
static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcName, param_2));
JUT_ASSERT(21373, btk_anm != 0);
JUT_ASSERT(21373, btk_anm != NULL);
btk_anm->searchUpdateMaterialID(param_1);
param_1->entryTexMtxAnimator(btk_anm);
btk_anm->setFrame(0.0f);
@@ -12120,7 +12120,7 @@ J3DAnmTextureSRTKey* daPy_lk_c::entryBtk(J3DModelData* param_1, int param_2) {
J3DAnmTevRegKey* daPy_lk_c::entryBrk(J3DModelData* param_1, int param_2) {
J3DAnmTevRegKey* brk_anm =
static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcName, param_2));
JUT_ASSERT(21395, brk_anm != 0);
JUT_ASSERT(21395, brk_anm != NULL);
brk_anm->searchUpdateMaterialID(param_1);
param_1->entryTevRegAnimator(brk_anm);
brk_anm->setFrame(0.0f);
src/d/actor/d_a_ship.cpp
+5 -5
View File
@@ -4383,7 +4383,7 @@ BOOL daShip_c::createHeap() {
m0392 = SHIP_BCK_FN_MAST_OFF2;
}
modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_FN_BODY);
JUT_ASSERT(VERSION_SELECT(6969, 7004, 7004, 7004), modelData != 0);
JUT_ASSERT(VERSION_SELECT(6969, 7004, 7004, 7004), modelData != NULL);
mpBodyAnm = new mDoExt_McaMorf(
modelData, NULL, NULL,
@@ -4408,7 +4408,7 @@ BOOL daShip_c::createHeap() {
}
modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_VFNCN);
JUT_ASSERT(VERSION_SELECT(7006, 7041, 7041, 7041), modelData != 0);
JUT_ASSERT(VERSION_SELECT(7006, 7041, 7041, 7041), modelData != NULL);
mpCannonModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
if (mpCannonModel == NULL) {
@@ -4416,7 +4416,7 @@ BOOL daShip_c::createHeap() {
}
modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_VFNCR);
JUT_ASSERT(VERSION_SELECT(7019, 7054, 7054, 7054), modelData != 0);
JUT_ASSERT(VERSION_SELECT(7019, 7054, 7054, 7054), modelData != NULL);
mpSalvageArmModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
if (mpSalvageArmModel == NULL) {
@@ -4424,7 +4424,7 @@ BOOL daShip_c::createHeap() {
}
modelData = (J3DModelData *)dComIfG_getObjectRes("Link", LINK_BDL_ROPEEND);
JUT_ASSERT(VERSION_SELECT(7032, 7067, 7067, 7067), modelData != 0);
JUT_ASSERT(VERSION_SELECT(7032, 7067, 7067, 7067), modelData != NULL);
mpLinkModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
if (mpLinkModel == NULL) {
@@ -4432,7 +4432,7 @@ BOOL daShip_c::createHeap() {
}
modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_FN_HEAD_H);
JUT_ASSERT(VERSION_SELECT(7045, 7080, 7080, 7080), modelData != 0);
JUT_ASSERT(VERSION_SELECT(7045, 7080, 7080, 7080), modelData != NULL);
m03B4 = SHIP_BCK_FN_LOOK_L;
src/d/d_file_select.cpp
+4 -4
View File
@@ -92,14 +92,14 @@ dFs_HIO_c::dFs_HIO_c() {
/* 8017FA20-8017FCC0 .text _create__14dFile_select_cFv */
void dFile_select_c::_create() {
fileSel.Scr = new J2DScreen();
JUT_ASSERT(VERSION_SELECT(297, 297, 356, 356), fileSel.Scr != 0);
JUT_ASSERT(VERSION_SELECT(297, 297, 356, 356), fileSel.Scr != NULL);
stick = new STControl(5, 2, 3, 2);
JUT_ASSERT(VERSION_SELECT(302, 302, 361, 361), stick != 0);
JUT_ASSERT(VERSION_SELECT(302, 302, 361, 361), stick != NULL);
stick2 = new STControl(3, 1, 3, 2);
JUT_ASSERT(VERSION_SELECT(305, 305, 364, 364), stick2 != 0);
JUT_ASSERT(VERSION_SELECT(305, 305, 364, 364), stick2 != NULL);
fileSel.Scr->set("file_select.blo", (JKRArchive*)field_0x0);
fileSel.font = mDoExt_getMesgFont();
JUT_ASSERT(VERSION_SELECT(311, 311, 370, 370), fileSel.font != 0);
JUT_ASSERT(VERSION_SELECT(311, 311, 370, 370), fileSel.font != NULL);
g_fsHIO.mNo = mDoHIO_createChild("ファイルセレクト画面", &g_fsHIO);
mSaveDataPtr = NULL;
mSavePicDataPtr = NULL;