mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-31 07:45:48 -04:00
Fix all -Wconversion-null warnings
This commit is contained in:
+1
-1
@@ -224,7 +224,7 @@ bool DynamicModuleControl::do_load() {
|
||||
if (mModule == NULL) {
|
||||
snprintf(buffer, 64, "/rel/Final/Release/%s.rel", mName);
|
||||
mModule = (OSModuleHeader*)JKRDvdToMainRam(
|
||||
buffer, NULL, EXPAND_SWITCH_UNKNOWN1, NULL, heap,
|
||||
buffer, NULL, EXPAND_SWITCH_UNKNOWN1, 0, heap,
|
||||
JKRDvdRipper::ALLOC_DIRECTION_FORWARD, 0, NULL, NULL);
|
||||
if (mModule != NULL) {
|
||||
mSize = 0;
|
||||
|
||||
@@ -917,7 +917,7 @@ JUTTexture* J2DPictureEx::getTexture(u8 param_0) const {
|
||||
|
||||
u8 J2DPictureEx::getTextureCount() const {
|
||||
if (mMaterial == NULL) {
|
||||
return NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
return mMaterial->getTexGenBlock()->getTexGenNum();
|
||||
|
||||
@@ -227,7 +227,7 @@ void J3DShape::makeVtxArrayCmd() {
|
||||
if (array[i] != 0)
|
||||
GDSetArray((GXAttr)(i + GX_VA_POS), array[i], stride[i]);
|
||||
else
|
||||
GDSetArrayRaw((GXAttr)(i + GX_VA_POS), NULL, stride[i]);
|
||||
GDSetArrayRaw((GXAttr)(i + GX_VA_POS), 0, stride[i]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ JASWaveArc* JASSimpleWaveBank::getWaveArc(u32 no) {
|
||||
int JASSimpleWaveBank::TWaveHandle::getWavePtr() const {
|
||||
void* base = mHeap->getBase();
|
||||
if (base == NULL) {
|
||||
return NULL;
|
||||
return 0;
|
||||
}
|
||||
return (intptr_t)base + mWaveInfo.field_0x08;
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ namespace {
|
||||
field_0x4 = stack_14.getNumFiles();
|
||||
field_0x8 = new s32[field_0x4];
|
||||
if (!field_0x8) {
|
||||
field_0x4 = NULL;
|
||||
field_0x4 = 0;
|
||||
return;
|
||||
}
|
||||
for (u32 i = 0; i < field_0x4; i++) {
|
||||
|
||||
@@ -69,7 +69,7 @@ JKRAram::JKRAram(u32 audio_buffer_size, u32 audio_graph_size, s32 priority)
|
||||
if (mAramMemorySize) {
|
||||
mAramMemoryPtr = ARAlloc(mAramMemorySize);
|
||||
} else {
|
||||
mAramMemoryPtr = NULL;
|
||||
mAramMemoryPtr = 0;
|
||||
}
|
||||
|
||||
OS_REPORT("ARAM audio area %08x: %08x\n", mAudioMemoryPtr, mAudioMemorySize);
|
||||
|
||||
@@ -192,7 +192,7 @@ u32 JKRFileCache::readResource(void* dst, u32 dstLength, u32, const char* path)
|
||||
if (findFile(finalPath, path)) {
|
||||
return readResource(dst, dstLength, filePath);
|
||||
}
|
||||
return NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void JKRFileCache::removeResourceAll(void) {
|
||||
|
||||
@@ -73,7 +73,7 @@ void JKRThread::setCommon_mesgQueue(JKRHeap* heap, int message_count) {
|
||||
sThreadList.append(&mThreadListLink);
|
||||
|
||||
mCurrentHeap = NULL;
|
||||
mCurrentHeapError = NULL;
|
||||
mCurrentHeapError = 0;
|
||||
}
|
||||
|
||||
void JKRThread::setCommon_heapSpecified(JKRHeap* heap, u32 stack_size, int param_3) {
|
||||
|
||||
@@ -39,7 +39,7 @@ void JPABaseEmitter::init(JPAEmitterManager* param_0, JPAResource* param_1) {
|
||||
mGlobalPrmClr.r = mGlobalPrmClr.g = mGlobalPrmClr.b = mGlobalPrmClr.a = mGlobalEnvClr.r = mGlobalEnvClr.g = mGlobalEnvClr.b = mGlobalEnvClr.a = 0xff;
|
||||
param_1->getBsp()->getPrmClr(&mPrmClr);
|
||||
param_1->getBsp()->getEnvClr(&mEnvClr);
|
||||
mpUserWork = NULL;
|
||||
mpUserWork = 0;
|
||||
mScaleOut = 1.0f;
|
||||
mEmitCount = 0.0f;
|
||||
initStatus(0x30);
|
||||
|
||||
@@ -12223,7 +12223,7 @@ BOOL daAlink_c::checkGroundSpecialMode() {
|
||||
return procScreamWaitInit();
|
||||
}
|
||||
|
||||
return NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int daAlink_c::commonCheckNextAction(int param_0) {
|
||||
|
||||
@@ -339,7 +339,7 @@ void daAlink_c::setHorseStirrup() {
|
||||
if (field_0x2fab & 1) {
|
||||
mDoMtx_stack_c::copy(mpLinkModel->getAnmMtx(field_0x30bc));
|
||||
mDoMtx_stack_c::transM(-2.0f, -11.0f, 1.5f);
|
||||
mDoMtx_stack_c::ZXYrotM(NULL, -0x8000, 0x4000);
|
||||
mDoMtx_stack_c::ZXYrotM(0, -0x8000, 0x4000);
|
||||
mDoMtx_copy(mDoMtx_stack_c::get(), horse->getLeftStirrupMtx());
|
||||
}
|
||||
|
||||
|
||||
@@ -346,7 +346,7 @@ int daAlink_c::checkNextActionSwim() {
|
||||
int daAlink_c::checkSwimAction(int param_0) {
|
||||
f32 var_f31;
|
||||
if (checkWolf()) {
|
||||
if (getMoveBGActorName(mLinkAcch.m_gnd, NULL) == PROC_Obj_ITA) {
|
||||
if (getMoveBGActorName(mLinkAcch.m_gnd, 0) == PROC_Obj_ITA) {
|
||||
var_f31 = 200.0f;
|
||||
} else {
|
||||
var_f31 = mpHIO->mWolf.mWlSwim.m.mStartHeight;
|
||||
|
||||
@@ -4083,7 +4083,7 @@ int daB_DR_c::create() {
|
||||
gravity = -3.0f;
|
||||
|
||||
mSound.init(¤t.pos, &eyePos, 3, 1);
|
||||
mColliderStts.Init(0x19, NULL, this);
|
||||
mColliderStts.Init(0x19, 0, this);
|
||||
|
||||
fopAcM_OnStatus(this, 0x4000);
|
||||
|
||||
|
||||
@@ -306,7 +306,7 @@ int daDoor20_c::checkOpenMsgDoor(int* param_1) {
|
||||
*param_1 = 0;
|
||||
return 1;
|
||||
}
|
||||
field_0x624.init(NULL, msgNo, NULL, NULL);
|
||||
field_0x624.init(NULL, msgNo, 0, NULL);
|
||||
int rv = field_0x624.checkOpenDoor(this, param_1);
|
||||
dMsgObject_endFlowGroup();
|
||||
return rv;
|
||||
|
||||
@@ -2008,7 +2008,7 @@ static int daE_YH_Execute(e_yh_class* i_this) {
|
||||
J3DModel* model = i_this->mpMorf->getModel();
|
||||
model->setBaseTRMtx(mDoMtx_stack_c::get());
|
||||
|
||||
i_this->mpMorf->play(NULL, dComIfGp_getReverb(fopAcM_GetRoomNo(a_this)));
|
||||
i_this->mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(a_this)));
|
||||
i_this->mBrk->play();
|
||||
i_this->mpMorf->modelCalc();
|
||||
|
||||
|
||||
@@ -3147,7 +3147,7 @@ void daE_YM_c::action() {
|
||||
cXyz unused_vec(field_0x68c, field_0x68c, field_0x68c);
|
||||
cXyz my_pos = current.pos;
|
||||
setMidnaBindEffect(this, &mSound, &my_pos, &scale);
|
||||
mpMorf->play(NULL, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
|
||||
mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
|
||||
mpBrk->play();
|
||||
}
|
||||
|
||||
|
||||
@@ -511,7 +511,7 @@ void daKago_c::demo_skip(int param_0) {
|
||||
switch (param_0) {
|
||||
case 0:
|
||||
field_0x748 = 2;
|
||||
field_0x74c = NULL;
|
||||
field_0x74c = 0;
|
||||
break;
|
||||
case 1:
|
||||
field_0x728 = 0;
|
||||
@@ -525,7 +525,7 @@ void daKago_c::demo_skip(int param_0) {
|
||||
/* dSv_event_flag_c::M_051 - Main Event - Shadow Kargorok (?) (Large) event complete (Horse grass appears in various places) */
|
||||
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[84]);
|
||||
field_0x748 = 7;
|
||||
field_0x74c = NULL;
|
||||
field_0x74c = 0;
|
||||
break;
|
||||
case 4:
|
||||
setSceneChange(0);
|
||||
|
||||
@@ -736,14 +736,14 @@ void daNpcBlueNS_c::playMotion() {
|
||||
int daNpcBlueNS_c::setAction(int (daNpcBlueNS_c::*i_action)(int)) {
|
||||
field_0xdc0 = 3;
|
||||
if (mAction != NULL) {
|
||||
(this->*mAction)(NULL);
|
||||
(this->*mAction)(0);
|
||||
}
|
||||
|
||||
field_0xdc0 = 0;
|
||||
mAction = i_action;
|
||||
|
||||
if (mAction != NULL) {
|
||||
(this->*mAction)(NULL);
|
||||
(this->*mAction)(0);
|
||||
}
|
||||
|
||||
return 1;
|
||||
|
||||
@@ -883,7 +883,7 @@ void daNpc_Fairy_c::srchActors() {
|
||||
|
||||
BOOL daNpc_Fairy_c::evtTalk() {
|
||||
if (chkAction(&daNpc_Fairy_c::talk)) {
|
||||
(this->*mAction)(NULL);
|
||||
(this->*mAction)(0);
|
||||
} else {
|
||||
mPreItemNo = 0;
|
||||
|
||||
@@ -952,7 +952,7 @@ void daNpc_Fairy_c::action() {
|
||||
}
|
||||
|
||||
if (mAction) {
|
||||
(this->*mAction)(NULL);
|
||||
(this->*mAction)(0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1124,7 +1124,7 @@ BOOL daNpc_Fairy_c::setAction(actionFunc action, int param_2) {
|
||||
mMode = 0xFFFF;
|
||||
|
||||
if (mAction) {
|
||||
(this->*mAction)(NULL);
|
||||
(this->*mAction)(0);
|
||||
}
|
||||
|
||||
mMode = 0;
|
||||
|
||||
@@ -448,8 +448,8 @@ BOOL daNpc_grM_c::evtProc() {
|
||||
int face_motion, motion;
|
||||
if (ctrlMsgAnm(&face_motion, &motion, this, field_0xe2d)) {
|
||||
if (field_0xe26) {
|
||||
mFaceMotionSeqMngr.setNo(face_motion, -1.0f, TRUE, NULL);
|
||||
mMotionSeqMngr.setNo(motion, -1.0f, TRUE, NULL);
|
||||
mFaceMotionSeqMngr.setNo(face_motion, -1.0f, TRUE, 0);
|
||||
mMotionSeqMngr.setNo(motion, -1.0f, TRUE, 0);
|
||||
}
|
||||
} else if (tmp != 0 && field_0xe26) {
|
||||
setAfterTalkMotion();
|
||||
|
||||
@@ -277,7 +277,7 @@ static void message_shop(npc_henna_class* i_this) {
|
||||
i_this->field_0x750 = 1;
|
||||
}
|
||||
if (i_this->field_0x750 != 0) {
|
||||
fopAcM_OffStatus(actor, NULL);
|
||||
fopAcM_OffStatus(actor, 0);
|
||||
cLib_offBit<u32>(actor->attention_info.flags, fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
|
||||
} else {
|
||||
fopAcM_OnStatus(actor, 0);
|
||||
|
||||
@@ -853,7 +853,7 @@ BOOL daNpcKasiHana_c::main() {
|
||||
}
|
||||
|
||||
if (mAction) {
|
||||
(this->*mAction)(NULL);
|
||||
(this->*mAction)(0);
|
||||
}
|
||||
|
||||
mKasiMng.sendInfo();
|
||||
@@ -1072,14 +1072,14 @@ BOOL daNpcKasiHana_c::setAction(actionFunc action) {
|
||||
mMode = -1;
|
||||
|
||||
if (mAction) {
|
||||
(this->*mAction)(NULL);
|
||||
(this->*mAction)(0);
|
||||
}
|
||||
|
||||
mMode = 0;
|
||||
mAction = action;
|
||||
|
||||
if (mAction) {
|
||||
(this->*mAction)(NULL);
|
||||
(this->*mAction)(0);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
||||
@@ -400,7 +400,7 @@ BOOL daNpcKasiKyu_c::main() {
|
||||
}
|
||||
|
||||
if (mAction) {
|
||||
(this->*mAction)(NULL);
|
||||
(this->*mAction)(0);
|
||||
}
|
||||
|
||||
playMotion();
|
||||
@@ -621,14 +621,14 @@ BOOL daNpcKasiKyu_c::setAction(actionFunc action) {
|
||||
mMode = -1;
|
||||
|
||||
if (mAction) {
|
||||
(this->*mAction)(NULL);
|
||||
(this->*mAction)(0);
|
||||
}
|
||||
|
||||
mMode = 0;
|
||||
mAction = action;
|
||||
|
||||
if (mAction) {
|
||||
(this->*mAction)(NULL);
|
||||
(this->*mAction)(0);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
||||
@@ -400,7 +400,7 @@ BOOL daNpcKasiMich_c::main() {
|
||||
}
|
||||
|
||||
if (mAction) {
|
||||
(this->*mAction)(NULL);
|
||||
(this->*mAction)(0);
|
||||
}
|
||||
|
||||
playMotion();
|
||||
@@ -621,14 +621,14 @@ BOOL daNpcKasiMich_c::setAction(actionFunc action) {
|
||||
mMode = -1;
|
||||
|
||||
if (mAction) {
|
||||
(this->*mAction)(NULL);
|
||||
(this->*mAction)(0);
|
||||
}
|
||||
|
||||
mMode = 0;
|
||||
mAction = action;
|
||||
|
||||
if (mAction) {
|
||||
(this->*mAction)(NULL);
|
||||
(this->*mAction)(0);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
||||
@@ -386,7 +386,7 @@ int daNpc_Maro_c::Execute() {
|
||||
setSellItemMax(getMaxNumItem());
|
||||
field_0xf60 = -1;
|
||||
setMasterType(2);
|
||||
mShopCamAction.setCamDataIdx(NULL);
|
||||
mShopCamAction.setCamDataIdx(0);
|
||||
mShopCamAction.setCamAction(NULL);
|
||||
field_0x1131 = 1;
|
||||
}
|
||||
|
||||
@@ -1485,7 +1485,7 @@ bool daNpcShad_c::talk(void* param_1) {
|
||||
if (strcmp(dComIfGp_getStartStageName(), "R_SP116") == 0 || mCurAngle.y == fopAcM_searchPlayerAngleY(this)) {
|
||||
if (talkProc(NULL, TRUE, NULL)) {
|
||||
mActorMngr[0].entry(daPy_getPlayerActorClass());
|
||||
itemNo = NULL;
|
||||
itemNo = 0;
|
||||
eventID = mFlow.getEventId(&itemNo);
|
||||
OS_REPORT("会話終了時 イベントID=%d アイテムNo=%d\n", eventID, itemNo); // At the end of the conversation, Event ID=%d Item No=%d
|
||||
|
||||
|
||||
@@ -1822,7 +1822,7 @@ BOOL daNpc_ykW_c::cutLv5DungeonClear(int param_0) {
|
||||
itemPos.y += 50.0f;
|
||||
|
||||
unkActor1 = fopAcM_fastCreateItem(&itemPos, 0, fopAcM_GetRoomNo(this), &unkSxyz,
|
||||
&unkXyz1, &unkFloat2, &unkFloat3, -1, NULL, NULL);
|
||||
&unkXyz1, &unkFloat2, &unkFloat3, -1, 0, NULL);
|
||||
if (unkActor1 != NULL) {
|
||||
mDoAud_seStart(Z2SE_OBJ_YO_HEART_S, &itemPos, 0, 0);
|
||||
fopAcM_OnStatus(unkActor1, fopAcM_STATUS_UNK_0x4000);
|
||||
|
||||
@@ -509,7 +509,7 @@ int daObjBATTA_c::execute() {
|
||||
action();
|
||||
mBrk->play();
|
||||
mBtk->play();
|
||||
mpMorf->play(NULL, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
|
||||
mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
|
||||
mtx_set();
|
||||
if (field_0x9f0 == 0) {
|
||||
mSph.SetC(current.pos);
|
||||
|
||||
@@ -30,7 +30,7 @@ void daObj_Bed_HIO_c::genMessage(JORMContext* ctx) {
|
||||
}
|
||||
#endif
|
||||
|
||||
daObj_Bed_HIOParam const daObj_Bed_Param_c::m = {NULL, -3.0f, 1.0f, 600.0f};
|
||||
daObj_Bed_HIOParam const daObj_Bed_Param_c::m = {0, -3.0f, 1.0f, 600.0f};
|
||||
|
||||
daObj_Bed_c::~daObj_Bed_c() {
|
||||
if (mpCollider != NULL) {
|
||||
|
||||
@@ -68,7 +68,7 @@ int daBkyRock_c::draw() {
|
||||
|
||||
mModels[mMode], &tevStr);
|
||||
if (field_0x57a) {
|
||||
dMdl_c* dMdl = dMdl_mng_c::entry(mModels[2]->getModelData(), NULL, current.roomNo);
|
||||
dMdl_c* dMdl = dMdl_mng_c::entry(mModels[2]->getModelData(), 0, current.roomNo);
|
||||
if (dMdl != NULL) {
|
||||
_pieceData* piece = mPieces;
|
||||
for (int i = 0; i < 20; i++, piece++) {
|
||||
|
||||
@@ -74,9 +74,9 @@ int daObjDigholl_c::execute() {
|
||||
}
|
||||
|
||||
if (player->current.pos.abs(current.pos) < 1000.0f) {
|
||||
dComIfGp_particle_setSimple(0x70f, ¤t.pos, 0xff, g_whiteColor, g_whiteColor, NULL,
|
||||
dComIfGp_particle_setSimple(0x70f, ¤t.pos, 0xff, g_whiteColor, g_whiteColor, 0,
|
||||
0.0f);
|
||||
dComIfGp_particle_setSimple(0x73d, ¤t.pos, 0xff, g_whiteColor, g_whiteColor, NULL,
|
||||
dComIfGp_particle_setSimple(0x73d, ¤t.pos, 0xff, g_whiteColor, g_whiteColor, 0,
|
||||
0.0f);
|
||||
}
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ public:
|
||||
};
|
||||
|
||||
daLv3Water_HIO_c::daLv3Water_HIO_c() {
|
||||
mLevelControlWaitFrames = NULL;
|
||||
mLevelControlWaitFrames = 0;
|
||||
}
|
||||
|
||||
#if DEBUG
|
||||
|
||||
@@ -127,7 +127,7 @@ int daLv6ChangeGate_c::Execute(Mtx** param_0) {
|
||||
|
||||
for (int i = 0; i < 12; i++) {
|
||||
cXyz spC(cyl_x_offset + mMoveTransX, 0.0f, 0.0f);
|
||||
mDoMtx_stack_c::ZXYrotS(NULL, shape_angle.y, shape_angle.z);
|
||||
mDoMtx_stack_c::ZXYrotS(0, shape_angle.y, shape_angle.z);
|
||||
mDoMtx_stack_c::multVec(&spC, &spC);
|
||||
spC += current.pos;
|
||||
|
||||
@@ -251,7 +251,7 @@ void daLv6ChangeGate_c::init_modeBreak() {
|
||||
|
||||
void daLv6ChangeGate_c::modeBreak() {
|
||||
cXyz effpos(mMoveTransX, 0.0f, 0.0f);
|
||||
mDoMtx_stack_c::ZXYrotS(NULL, shape_angle.y, shape_angle.z);
|
||||
mDoMtx_stack_c::ZXYrotS(0, shape_angle.y, shape_angle.z);
|
||||
mDoMtx_stack_c::multVec(&effpos, &effpos);
|
||||
effpos += current.pos;
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ int daObjProp_c::Delete() {
|
||||
}
|
||||
|
||||
int daObjProp_c::draw() {
|
||||
g_env_light.settingTevStruct(NULL, ¤t.pos, &tevStr);
|
||||
g_env_light.settingTevStruct(0, ¤t.pos, &tevStr);
|
||||
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
|
||||
mDoExt_modelUpdate(mpModel);
|
||||
return 1;
|
||||
|
||||
@@ -16,7 +16,7 @@ static char* l_ropeArcName = "L_Ropest";
|
||||
|
||||
void daObjRBridge_c::initBaseMtx() {
|
||||
mDoMtx_stack_c::transS(current.pos);
|
||||
mDoMtx_stack_c::ZXYrotM(NULL, current.angle.y, 0);
|
||||
mDoMtx_stack_c::ZXYrotM(0, current.angle.y, 0);
|
||||
MTXCopy(mDoMtx_stack_c::get(), mMtx);
|
||||
|
||||
mpBrgModel->setBaseScale(scale);
|
||||
|
||||
@@ -736,7 +736,7 @@ void daObj_Sekizoa_c::setAttnPos() {
|
||||
mpMorf[1]->modelCalc();
|
||||
}
|
||||
if (mpMcaMorf != NULL) {
|
||||
((mDoExt_McaMorfSO*)mpMcaMorf)->play(NULL, 0);
|
||||
((mDoExt_McaMorfSO*)mpMcaMorf)->play(0, 0);
|
||||
if (mType == TYPE_1 || mType == TYPE_3 || mType == TYPE_5) {
|
||||
mDoMtx_stack_c::copy(mpMorf[0]->getModel()->getAnmMtx(7));
|
||||
} else {
|
||||
|
||||
@@ -807,7 +807,7 @@ void daObjStone_c::init_modeBreak() {
|
||||
JPABaseEmitter* emitter = dComIfGp_particle_set(
|
||||
0x15c, ¤t.pos, 0, &acStack_40, 0xff, &dPa_modelEcallBack::getEcallback(), fopAcM_GetRoomNo(this), 0, 0, 0);
|
||||
dPa_modelEcallBack::setModel(emitter, stone_bmd, tevStr,
|
||||
3, 0, NULL, 0);
|
||||
3, 0, 0, 0);
|
||||
for (int i = 0; i < 3; i = i + 1) {
|
||||
dComIfGp_particle_set(
|
||||
l_eff_id[i],
|
||||
|
||||
@@ -47,7 +47,7 @@ int daObjVGnd_c::CreateHeap() {
|
||||
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 0xb);
|
||||
JUT_ASSERT(198, pbtk != NULL);
|
||||
mpBtk = new mDoExt_btkAnm();
|
||||
if ((!mpBtk) || (!mpBtk->init(modelData, pbtk, 1, NULL, 1.0f, NULL, -1))) {
|
||||
if ((!mpBtk) || (!mpBtk->init(modelData, pbtk, 1, 0, 1.0f, 0, -1))) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@@ -56,7 +56,7 @@ int daObjVGnd_c::CreateHeap() {
|
||||
J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 0x8);
|
||||
JUT_ASSERT(212, pbrk != NULL);
|
||||
mpBrk = new mDoExt_brkAnm();
|
||||
if ((!mpBrk) || (!mpBrk->init(modelData, pbrk, 1, NULL, 1.0f, NULL, -1))) {
|
||||
if ((!mpBrk) || (!mpBrk->init(modelData, pbrk, 1, 0, 1.0f, 0, -1))) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -128,7 +128,7 @@ void daShopItem_c::CreateInit() {
|
||||
|
||||
home.pos = current.pos;
|
||||
set_mtx();
|
||||
mpModel->setUserArea(NULL);
|
||||
mpModel->setUserArea(0);
|
||||
}
|
||||
|
||||
void daShopItem_c::set_mtx() {
|
||||
|
||||
@@ -517,7 +517,7 @@ int daTag_AllMato_c::checkCrsMato2() {
|
||||
}
|
||||
|
||||
fopAc_ac_c* sp18 = NULL;
|
||||
int sp14 = NULL;
|
||||
int sp14 = 0;
|
||||
|
||||
for (int i = 0; i < 499; i++) {
|
||||
for (int j = 0; j < mBouMatoActorNum; j++) {
|
||||
|
||||
@@ -689,9 +689,9 @@ void dBgWKCol::ShdwDraw(cBgS_ShdwDraw* param_0) {
|
||||
|
||||
do {
|
||||
stepY_sp78 = 1000000;
|
||||
best1_sp70 = NULL;
|
||||
best2_sp6C = NULL;
|
||||
best3_sp68 = NULL;
|
||||
best1_sp70 = 0;
|
||||
best2_sp6C = 0;
|
||||
best3_sp68 = 0;
|
||||
|
||||
int x_sp44 = minX_spA0;
|
||||
do {
|
||||
|
||||
+1
-1
@@ -255,7 +255,7 @@ dCcD_GObjInf* dCcD_GObjInf::GetTgHitGObj() {
|
||||
u8 dCcD_GObjInf::GetTgHitObjSe() {
|
||||
dCcD_GObjInf* objInf = GetTgHitGObj();
|
||||
if (objInf == NULL) {
|
||||
return NULL;
|
||||
return 0;
|
||||
} else {
|
||||
return objInf->GetAtSe();
|
||||
}
|
||||
|
||||
@@ -1245,7 +1245,7 @@ void* dEvent_manager_c::getMySubstanceP(int staffId, const char* dataname, int d
|
||||
int dEvent_manager_c::getMySubstanceNum(int staffId, const char* dataname) {
|
||||
dEvDtData_c* data = getMyDataP(staffId, dataname, FALSE);
|
||||
if (data == NULL) {
|
||||
return NULL;
|
||||
return 0;
|
||||
} else {
|
||||
return data->getNumber();
|
||||
}
|
||||
|
||||
@@ -1728,7 +1728,7 @@ void dMenu_Dmap_c::_create() {
|
||||
|
||||
screenInit();
|
||||
|
||||
mpDrawBg->getMapPane()->changeTexture(mMapCtrl->getResTIMGPointer(0), NULL);
|
||||
mpDrawBg->getMapPane()->changeTexture(mMapCtrl->getResTIMGPointer(0), 0);
|
||||
|
||||
if (mpDrawBg->getMapPane()->append(mMapCtrl->getResTIMGPointer(1), 1.0f)) {
|
||||
mpDrawBg->getMapPane()->setBlendRatio(1.0f, 0.0f);
|
||||
|
||||
@@ -492,7 +492,7 @@ void dMenu_Letter_c::read_open_init() {
|
||||
}
|
||||
J2DTextBox* text2 = (J2DTextBox*)field_0x2ec[i]->getPanePtr();
|
||||
mpString->getStringPage(dMenu_Letter::getLetterText(idx), field_0x3e3 - 1, LINE_MAX, text2, text1,
|
||||
NULL, NULL, NULL);
|
||||
NULL, NULL, 0);
|
||||
}
|
||||
field_0x3e2 = mpString->getPageMax(LINE_MAX);
|
||||
if (field_0x3e2 > 1) {
|
||||
@@ -642,7 +642,7 @@ void dMenu_Letter_c::read_next_fadein_init() {
|
||||
text1 = (J2DTextBox*)field_0x2f4[i]->getPanePtr();
|
||||
}
|
||||
J2DTextBox* text2 = (J2DTextBox*)field_0x2ec[i]->getPanePtr();
|
||||
mpString->getStringPage(dMenu_Letter::getLetterText(idx), field_0x3e3 - 1, LINE_MAX, text2, text1, NULL, NULL, NULL);
|
||||
mpString->getStringPage(dMenu_Letter::getLetterText(idx), field_0x3e3 - 1, LINE_MAX, text2, text1, NULL, NULL, 0);
|
||||
}
|
||||
char acStack_30[10];
|
||||
sprintf(acStack_30, "%d/%d", field_0x3e3, field_0x3e2);
|
||||
|
||||
@@ -1173,7 +1173,7 @@ void dMeter2Draw_c::initButton() {
|
||||
|
||||
for (int i = 0; i < 2; i++) {
|
||||
for (int j = 0; j < 2; j++) {
|
||||
field_0x524[i][j] = NULL;
|
||||
field_0x524[i][j] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ dMsgScrnStaff_c::dMsgScrnStaff_c(u8 unused) {
|
||||
mpScreen->search(MULTI_CHAR('right_n'))->hide();
|
||||
|
||||
for (int i = 0; i < 6; i++) {
|
||||
mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], NULL, NULL);
|
||||
mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], 0, NULL);
|
||||
((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(mDoExt_getMesgFont());
|
||||
((J2DTextBox*)mpTm_c[i]->getPanePtr())->setString(0x200, "");
|
||||
}
|
||||
|
||||
+1
-1
@@ -974,5 +974,5 @@ scene_process_profile_definition g_profile_LOGO_SCENE = {
|
||||
0,
|
||||
&g_fopScn_Method.base,
|
||||
&l_dScnLogo_Method,
|
||||
NULL,
|
||||
0,
|
||||
};
|
||||
|
||||
+2
-2
@@ -339,7 +339,7 @@ scene_process_profile_definition g_profile_NAME_SCENE = {
|
||||
0,
|
||||
&g_fopScn_Method.base,
|
||||
&l_dScnName_Method,
|
||||
NULL,
|
||||
0,
|
||||
};
|
||||
|
||||
scene_process_profile_definition g_profile_NAMEEX_SCENE = {
|
||||
@@ -353,5 +353,5 @@ scene_process_profile_definition g_profile_NAMEEX_SCENE = {
|
||||
0,
|
||||
&g_fopScn_Method.base,
|
||||
&l_dScnName_Method,
|
||||
NULL,
|
||||
0,
|
||||
};
|
||||
|
||||
+5
-5
@@ -2456,10 +2456,10 @@ static int dStage_elstInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2,
|
||||
}
|
||||
|
||||
static void dKankyo_create() {
|
||||
fopKyM_fastCreate(PROC_KANKYO, NULL, NULL, NULL, NULL);
|
||||
fopKyM_fastCreate(PROC_KYEFF, NULL, NULL, NULL, NULL);
|
||||
fopKyM_fastCreate(PROC_KYEFF2, NULL, NULL, NULL, NULL);
|
||||
fopKyM_fastCreate(PROC_ENVSE, NULL, NULL, NULL, NULL);
|
||||
fopKyM_fastCreate(PROC_KANKYO, 0, NULL, NULL, NULL);
|
||||
fopKyM_fastCreate(PROC_KYEFF, 0, NULL, NULL, NULL);
|
||||
fopKyM_fastCreate(PROC_KYEFF2, 0, NULL, NULL, NULL);
|
||||
fopKyM_fastCreate(PROC_ENVSE, 0, NULL, NULL, NULL);
|
||||
}
|
||||
|
||||
static void layerMemoryInfoLoader(void* i_data, dStage_dt_c* i_stage, int param_2) {
|
||||
@@ -2710,7 +2710,7 @@ void dStage_Create() {
|
||||
JUT_ASSERT(4517, status);
|
||||
}
|
||||
|
||||
*dStage_roomControl_c::getDemoArcName() = NULL;
|
||||
*dStage_roomControl_c::getDemoArcName() = 0;
|
||||
dKankyo_create();
|
||||
|
||||
if (dComIfG_getStageRes("vrbox_sora.bmd")) {
|
||||
|
||||
Reference in New Issue
Block a user