From 4d3f25d34ed0782ba693c80698631cac6add8f9c Mon Sep 17 00:00:00 2001 From: Niklas Bauer Date: Thu, 4 Dec 2025 13:57:33 +0100 Subject: [PATCH] Resolve all "illegal jump past declaration/initializer" warnings (#2911) * resolve illegal jump past declaration/initializer * pr comments --- include/d/actor/d_a_tag_TWgate.h | 4 +- src/JSystem/J2DGraph/J2DManage.cpp | 10 +-- src/JSystem/JKernel/JKRDvdArchive.cpp | 9 +- src/JSystem/JKernel/JKRMemArchive.cpp | 5 +- .../JStudio/JStudio/jstudio-control.cpp | 3 +- .../JStudio/JStudio_JStage/object-camera.cpp | 8 +- src/JSystem/JUtility/JUTCacheFont.cpp | 6 +- src/JSystem/JUtility/JUTResFont.cpp | 9 +- src/d/actor/d_a_b_bh.cpp | 6 +- src/d/actor/d_a_b_gg.cpp | 30 ++++--- src/d/actor/d_a_b_gm.cpp | 5 +- src/d/actor/d_a_door_bossL5.cpp | 3 +- src/d/actor/d_a_door_knob00.cpp | 10 ++- src/d/actor/d_a_door_mbossL1.cpp | 5 +- src/d/actor/d_a_door_push.cpp | 3 +- src/d/actor/d_a_door_shutter.cpp | 34 ++++---- src/d/actor/d_a_e_bi.cpp | 15 ++-- src/d/actor/d_a_e_bu.cpp | 3 +- src/d/actor/d_a_e_fz.cpp | 13 ++- src/d/actor/d_a_e_ge.cpp | 16 ++-- src/d/actor/d_a_e_hz.cpp | 12 +-- src/d/actor/d_a_e_kk.cpp | 6 +- src/d/actor/d_a_e_mm_mt.cpp | 6 +- src/d/actor/d_a_e_nest.cpp | 29 ++++--- src/d/actor/d_a_e_sh.cpp | 6 +- src/d/actor/d_a_e_sw.cpp | 58 ++++++------- src/d/actor/d_a_e_th.cpp | 5 +- src/d/actor/d_a_e_tt.cpp | 3 +- src/d/actor/d_a_e_vt.cpp | 12 ++- src/d/actor/d_a_e_yh.cpp | 36 ++++---- src/d/actor/d_a_kytag06.cpp | 10 ++- src/d/actor/d_a_npc_hoz.cpp | 3 +- src/d/actor/d_a_npc_ks.cpp | 1 + src/d/actor/d_a_npc_ne.cpp | 4 +- src/d/actor/d_a_npc_tkc.cpp | 4 +- src/d/actor/d_a_npc_uri.cpp | 6 +- src/d/actor/d_a_npc_zelRo.cpp | 3 +- src/d/actor/d_a_obj_avalanche.cpp | 4 +- src/d/actor/d_a_obj_carry.cpp | 3 +- src/d/actor/d_a_obj_enemy_create.cpp | 7 +- src/d/actor/d_a_obj_kabuto.cpp | 6 +- src/d/actor/d_a_obj_kgate.cpp | 3 +- src/d/actor/d_a_obj_rgate.cpp | 3 +- src/d/actor/d_a_obj_smgdoor.cpp | 3 +- src/d/actor/d_a_obj_swBallC.cpp | 3 +- src/d/actor/d_a_obj_ten.cpp | 6 +- src/d/actor/d_a_obj_thashi.cpp | 5 +- src/d/actor/d_a_scene_exit2.cpp | 3 +- src/d/actor/d_a_tag_TWgate.cpp | 87 ++++++++++--------- src/d/actor/d_a_tag_kago_fall.cpp | 6 +- src/d/actor/d_a_tag_river_back.cpp | 3 +- src/d/actor/d_a_tag_statue_evt.cpp | 12 +-- src/d/d_msg_flow.cpp | 6 +- 53 files changed, 320 insertions(+), 241 deletions(-) diff --git a/include/d/actor/d_a_tag_TWgate.h b/include/d/actor/d_a_tag_TWgate.h index adb69f098d..495be5bad2 100644 --- a/include/d/actor/d_a_tag_TWgate.h +++ b/include/d/actor/d_a_tag_TWgate.h @@ -17,7 +17,7 @@ public: /* 0x3 */ TYPE_HYRAL, }; - enum EAction { + enum Mode_e { /* 0x00 */ ACT_WAIT, /* 0x01 */ ACT_DEMO_FILONE_1, /* 0x02 */ ACT_DEMO_FILONE_2, @@ -106,7 +106,7 @@ public: (this->*(*mAction))(); } - void setAction(EAction action) { + void setAction(Mode_e action) { mActionID = action; mAction = ActionTable[mActionID]; callInit(); diff --git a/src/JSystem/J2DGraph/J2DManage.cpp b/src/JSystem/J2DGraph/J2DManage.cpp index 92fa1ab61a..0af6517313 100644 --- a/src/JSystem/J2DGraph/J2DManage.cpp +++ b/src/JSystem/J2DGraph/J2DManage.cpp @@ -44,9 +44,7 @@ char* J2DResReference::getName(u16 idx) const { p_name[0] = 0; return p_name; } else { - s8 first = resRef[0]; - - switch (first) { + switch (resRef[0]) { case 2: case 3: for (s32 i = 0; i < resRef[1]; i++) { @@ -54,8 +52,9 @@ char* J2DResReference::getName(u16 idx) const { } p_name[resRef[1]] = 0; break; - case 4: - s32 pos = resRef[1] + 1; + case 4: { + s32 tmp = resRef[1]; + s32 pos = tmp + 1; for (; pos >= 2; pos--) { if (resRef[pos] == '\\' || resRef[pos] == '/') { break; @@ -70,6 +69,7 @@ char* J2DResReference::getName(u16 idx) const { p_name[i] = 0; break; + } default: p_name[0] = 0; } diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp index f80674994c..03761ac322 100644 --- a/src/JSystem/JKernel/JKRDvdArchive.cpp +++ b/src/JSystem/JKernel/JKRDvdArchive.cpp @@ -75,7 +75,8 @@ bool JKRDvdArchive::open(s32 entryNum) { JKRDvdRipper::ALLOC_DIRECTION_FORWARD, 0, &mCompression, NULL); DCInvalidateRange(arcHeader, sizeof(SArcHeader)); - int alignment = mMountDirection == MOUNT_DIRECTION_HEAD ? 0x20 : -0x20; + int alignment; + alignment = mMountDirection == MOUNT_DIRECTION_HEAD ? 0x20 : -0x20; mArcInfoBlock = (SArcDataInfo*)JKRAllocFromHeap(mHeap, arcHeader->file_data_offset, alignment); if (!mArcInfoBlock) { @@ -93,8 +94,10 @@ bool JKRDvdArchive::open(s32 entryNum) { mStringTable = (char*)((int)&mArcInfoBlock->num_nodes + mArcInfoBlock->string_table_offset); mExpandedSize = NULL; - u8 useCompression = 0; - SDIFileEntry* fileEntry = mFiles; + u8 useCompression; + useCompression = 0; + SDIFileEntry* fileEntry; + fileEntry = mFiles; for (u32 i = 0; i < mArcInfoBlock->num_file_entries; fileEntry++, i++) { if (fileEntry->isUnknownFlag1()) { useCompression |= fileEntry->getCompressFlag(); diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/src/JSystem/JKernel/JKRMemArchive.cpp index 1fa9fd4ffc..682e0ff283 100644 --- a/src/JSystem/JKernel/JKRMemArchive.cpp +++ b/src/JSystem/JKernel/JKRMemArchive.cpp @@ -195,15 +195,18 @@ u32 JKRMemArchive::fetchResource_subroutine(u8* src, u32 srcLength, u8* dst, u32 return srcLength; case COMPRESSION_YAY0: - case COMPRESSION_YAZ0: + case COMPRESSION_YAZ0: { u32 expendedSize = JKRDecompExpandSize(src); + #if VERSION != VERSION_SHIELD_DEBUG srcLength = expendedSize; + #endif if (expendedSize > dstLength) { srcLength = dstLength; } JKRDecompress(src, dst, srcLength, 0); return srcLength; + } default: { JUTException::panic(__FILE__, 723, "??? bad sequence\n"); diff --git a/src/JSystem/JStudio/JStudio/jstudio-control.cpp b/src/JSystem/JStudio/JStudio/jstudio-control.cpp index 2b49a80e80..0a9f83585b 100644 --- a/src/JSystem/JStudio/JStudio/jstudio-control.cpp +++ b/src/JSystem/JStudio/JStudio/jstudio-control.cpp @@ -48,7 +48,7 @@ int JStudio::TControl::transformOnGet_setOrigin_TxyzRy(Vec const& param_0, f32 p int JStudio::TControl::transform_setOrigin_ctb(JStudio::ctb::TObject const& param_0) { switch (param_0.getScheme()) { - case 1: + case 1: { const f32* pfVar4 = (const f32*)param_0.getData(); Vec local_144 = {0.0f, 0.0f, 0.0f}; local_144.x = pfVar4[0]; @@ -56,6 +56,7 @@ int JStudio::TControl::transform_setOrigin_ctb(JStudio::ctb::TObject const& para local_144.z = pfVar4[2]; transform_setOrigin_TxyzRy(local_144, pfVar4[3]); break; + } default: return 0; } diff --git a/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp b/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp index 173f821ae7..9620b880f5 100644 --- a/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp @@ -117,9 +117,9 @@ JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_ENABLE(JStudio::data::TEOpera case JStudio::data::UNK_0x2: JUT_ASSERT(185, uSize==4); JUT_ASSERT(186, pContent!=NULL); - field_0x114 = *(u32*)pContent ? 1 : 0; + field_0x114 = *(u32*)pContent ? true : false; switch(field_0x108) { - case 1: + case 1: { JStage::TObject* parent = 0; int idx = -1; if (field_0x114 != 0) { @@ -128,6 +128,7 @@ JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_ENABLE(JStudio::data::TEOpera } pJSGObject_->JSGSetParent(parent, idx); break; + } case 0: break; } @@ -207,7 +208,7 @@ void JStudio_JStage::TAdaptor_camera::setJSG_position_(JStudio::TControl const* } else { pViewPosition = &VStack_138; switch (field_0x108) { - case 0: + case 0: { int iVar1 = transform_toGlobalFromLocal(&VStack_144, VStack_138, field_0x10c, field_0x110); if (iVar1 == 0) { @@ -215,6 +216,7 @@ void JStudio_JStage::TAdaptor_camera::setJSG_position_(JStudio::TControl const* } pViewPosition = &VStack_144; break; + } case 1: break; } diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/src/JSystem/JUtility/JUTCacheFont.cpp index 4ddb4bbc52..6ed26d4fb8 100644 --- a/src/JSystem/JUtility/JUTCacheFont.cpp +++ b/src/JSystem/JUtility/JUTCacheFont.cpp @@ -277,9 +277,9 @@ void JUTCacheFont::setBlock() { break; case 'GLY1': memcpy(piVar5, pData, 0x20); - JKRAramBlock* iVar1 = - JKRMainRamToAram((u8*)pData + 0x20, aramAddress, pData[1] - 0x20, - EXPAND_SWITCH_UNKNOWN0, 0, NULL, 0xffffffff, NULL); + JKRAramBlock* iVar1; + iVar1 = JKRMainRamToAram((u8*)pData + 0x20, aramAddress, pData[1] - 0x20, + EXPAND_SWITCH_UNKNOWN0, 0, NULL, 0xffffffff, NULL); if (iVar1 == NULL) { JUTException::panic("JUTCacheFont.cpp", 0x1dd, "trouble occurred in JKRMainRamToAram."); diff --git a/src/JSystem/JUtility/JUTResFont.cpp b/src/JSystem/JUtility/JUTResFont.cpp index 52c8ca7d1e..b375a90388 100644 --- a/src/JSystem/JUtility/JUTResFont.cpp +++ b/src/JSystem/JUtility/JUTResFont.cpp @@ -126,14 +126,15 @@ void JUTResFont::setBlock() { mMaxCode = -1; BlockHeader* data = (BlockHeader*)mResFont->data; - for (u32 i = 0; i < mResFont->numBlocks; i++, data = (BlockHeader*)data->getNext()) { + for (u32 i = 0; i < mResFont->numBlocks; data = (BlockHeader*)data->getNext(), i++) { switch (data->magic) { - case 'INF1': - mInf1Ptr = (ResFONT::INF1*)data; + case 'INF1': { + mInf1Ptr = (ResFONT::INF1*)data; u32 u = mInf1Ptr->fontType; JUT_ASSERT(244, u < suAboutEncoding_); mIsLeadByte = &saoAboutEncoding_[u]; - break; + break; + } case 'WID1': mpWidthBlocks[widthNum] = (ResFONT::WID1*)data; diff --git a/src/d/actor/d_a_b_bh.cpp b/src/d/actor/d_a_b_bh.cpp index d85bba5e57..9a21a5755b 100644 --- a/src/d/actor/d_a_b_bh.cpp +++ b/src/d/actor/d_a_b_bh.cpp @@ -354,6 +354,7 @@ static s8 b_bh_down(b_bh_class* i_this) { s8 sp8 = 0; cXyz sp20 = i_this->field_0x6b0 - a_this->current.pos; sp20.y = 0.0f; + f32 temp_f31; switch (i_this->mMode) { case 0: @@ -371,7 +372,7 @@ static s8 b_bh_down(b_bh_class* i_this) { i_this->mSound.startCreatureVoiceLevel(Z2SE_EN_BH_V_ROUT, -1); } - f32 temp_f31 = 100.0f + JREG_F(0); + temp_f31 = 100.0f + JREG_F(0); sp2C.x = temp_f31 * cM_ssin(i_this->field_0x668 * (TREG_S(0) + 900)); sp2C.z = temp_f31 * cM_scos(i_this->field_0x668 * (TREG_S(2) + 1000)); @@ -661,6 +662,7 @@ static s8 b_bh_b_down(b_bh_class* i_this) { s8 var_r27 = 0; cXyz spC = i_this->field_0x6b0 - i_this->current.pos; spC.y = 0.0f; + f32 temp_f31; switch (i_this->mMode) { case 0: @@ -678,7 +680,7 @@ static s8 b_bh_b_down(b_bh_class* i_this) { i_this->mSound.startCreatureVoiceLevel(Z2SE_EN_BH_V_ROUT, -1); } - f32 temp_f31 = 100.0f + JREG_F(0); + temp_f31 = 100.0f + JREG_F(0); sp18.x = temp_f31 * cM_ssin(i_this->field_0x668 * (TREG_S(0) + 900)); sp18.z = temp_f31 * cM_scos(i_this->field_0x668 * (TREG_S(2) + 1000)); diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp index 7297f802a3..d75a2f8cf2 100644 --- a/src/d/actor/d_a_b_gg.cpp +++ b/src/d/actor/d_a_b_gg.cpp @@ -2652,11 +2652,12 @@ void daB_GG_c::FallChk() { } void daB_GG_c::G_AttackAction() { + int rnd; switch (mMode) { case 0: SpeedClear(); - int rnd = cM_rndF(100.0f); + rnd = cM_rndF(100.0f); if (rnd > 70) { SetAnm(BCK_GGB_ATTACK_A, 0, 5.0f, 1.0f); @@ -2723,7 +2724,7 @@ void daB_GG_c::G_AttackAction() { mCcCyl.OnTgShield(); mCcShieldSph.OnTgShield(); - int rnd = cM_rndF(100.0f); + rnd = cM_rndF(100.0f); if (rnd < 30 || mAnm == BCK_GGB_ATTACK_C) { SetAction(ACTION_GROUND, SUBACT_MOVE, 0); } else if (mAnm != BCK_GGB_ATTACK_C && rnd > 50) { @@ -2770,7 +2771,6 @@ void daB_GG_c::G_AttackAction() { mCcSph[i].OnAtSetBit(); mCcSph[i].SetAtSpl((dCcG_At_Spl) 0xA); } - break; } F_AtHit(); @@ -2904,11 +2904,13 @@ void daB_GG_c::G_DamageAction() { speedF = 0.0f; } - s_TargetAngle += 0x4000; + s_TargetAngle += (s16) 0x4000; break; case 2: - cXyz* tg_hit_pos = mCcCyl.GetTgHitPosP(); - s16 spA = cLib_targetAngleY(¤t.pos, tg_hit_pos); + cXyz* tg_hit_pos; + s16 spA; + tg_hit_pos = mCcCyl.GetTgHitPosP(); + spA = cLib_targetAngleY(¤t.pos, tg_hit_pos); if ((spA - shape_angle.y) > 0) { if (mAnm != BCK_GGB_DAMAGE_R) { SetAnm(BCK_GGB_DAMAGE_R, 0, 5.0f, 1.0f); @@ -2923,7 +2925,9 @@ void daB_GG_c::G_DamageAction() { SetAction(ACTION_GROUND, SUBACT_DAMAGE, 3); - if (health < (s16)(field_0x560 * l_HIO.field_0x18) && field_0x5b0 == 0 && mType == TYPE_L7_MBOSS) { + if (health < (s16)(field_0x560 * l_HIO.field_0x18) && field_0x5b0 == 0 && + mType == TYPE_L7_MBOSS) + { mpModelMorf->setPlaySpeed(1.0f); SetAction(ACTION_DEMO, 1, 0); mCamMode = 0; @@ -2954,11 +2958,16 @@ void daB_GG_c::G_DamageAction() { mCamMode = 0; } break; - case 3: - int cut_count = daPy_getPlayerActorClass()->getCutCount(); + case 3: { + u8 cut_count = daPy_getPlayerActorClass()->getCutCount(); u32 cut_type = daPy_getPlayerActorClass()->getCutType(); - if ((cut_type == daPy_py_c::CUT_TYPE_TURN_LEFT || cut_type == daPy_py_c::CUT_TYPE_TURN_RIGHT || cut_type == daPy_py_c::CUT_TYPE_LARGE_TURN_LEFT || cut_type == daPy_py_c::CUT_TYPE_LARGE_TURN_RIGHT) && field_0x6bc > 0) { + if ((cut_type == daPy_py_c::CUT_TYPE_TURN_LEFT || + cut_type == daPy_py_c::CUT_TYPE_TURN_RIGHT || + cut_type == daPy_py_c::CUT_TYPE_LARGE_TURN_LEFT || + cut_type == daPy_py_c::CUT_TYPE_LARGE_TURN_RIGHT) && + field_0x6bc > 0) + { mCcCyl.OnTgShield(); mCcShieldSph.OnTgShield(); mCcShieldSph.OnTgSetBit(); @@ -2984,6 +2993,7 @@ void daB_GG_c::G_DamageAction() { FallChk(); break; + } case 4: sp38 = eyePos; sp38.y += 180.0f + NREG_F(7); diff --git a/src/d/actor/d_a_b_gm.cpp b/src/d/actor/d_a_b_gm.cpp index ed60b409fd..274b17c1c5 100644 --- a/src/d/actor/d_a_b_gm.cpp +++ b/src/d/actor/d_a_b_gm.cpp @@ -1458,7 +1458,7 @@ static void demo_camera(b_gm_class* i_this) { i_this->mDemoModeTimer = 0; } break; - case 42: + case 42: { if (i_this->mDemoModeTimer == 30) { daPy_getPlayerActorClass()->changeDemoMode(daPy_demo_c::DEMO_UNEQUIP_e, 0, 0, 0); } @@ -1479,7 +1479,7 @@ static void demo_camera(b_gm_class* i_this) { if (i_this->mDemoModeTimer > 200) { cLib_addCalc2(&i_this->field_0x1cec.y, 100.0f, 0.05f, 0.7f); } - + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); if (ystone != NULL) { if (i_this->mDemoModeTimer > 200) { @@ -1500,6 +1500,7 @@ static void demo_camera(b_gm_class* i_this) { sp10 = 2; } break; + } case 50: if (!a_this->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0); diff --git a/src/d/actor/d_a_door_bossL5.cpp b/src/d/actor/d_a_door_bossL5.cpp index fea59909aa..fecc69d36f 100644 --- a/src/d/actor/d_a_door_bossL5.cpp +++ b/src/d/actor/d_a_door_bossL5.cpp @@ -204,12 +204,13 @@ void daBdoorL5_c::demoProc() { } } switch (demoAction) { - case 1: + case 1: { obj_keyhole_class* keyhole = (obj_keyhole_class*)fopAcM_SearchByID(mKeyHoleId); if ((keyhole != NULL && keyhole->checkOpenEnd()) || mKeyHoleId == -1) { dComIfGp_evmng_cutEnd(field_0x59c); } break; + } case 2: if (openProc() != 0) { openEnd(); diff --git a/src/d/actor/d_a_door_knob00.cpp b/src/d/actor/d_a_door_knob00.cpp index fdc9949619..74ddce445c 100644 --- a/src/d/actor/d_a_door_knob00.cpp +++ b/src/d/actor/d_a_door_knob00.cpp @@ -353,7 +353,8 @@ int daKnob20_c::demoProc() { field_0x610 = 10; break; case 10: - int msgNo = knob_param_c::getMsgNo(this); + int msgNo; + msgNo = knob_param_c::getMsgNo(this); if (msgNo != 0xffff) { field_0x5c0.init(this, msgNo, 0, NULL); } @@ -391,6 +392,7 @@ int daKnob20_c::demoProc() { case 10: dComIfGp_event_offHindFlag(1); if (field_0x5c0.doFlow(this, NULL, 0) != 0) { + OS_REPORT("会話終了！\n"); // Conversation over! int msgNo = knob_param_c::getMsgNo(this); if (msgNo != 0xffff) { field_0x5c0.init(this, msgNo, 0, NULL); @@ -406,12 +408,14 @@ int daKnob20_c::demoProc() { case 9: dComIfGp_evmng_cutEnd(field_0x5bc); break; - case 14: - if (cLib_addCalcAngleS(&field_0x612, -0x2800, 20, 500, 10) == 0) { + case 14: { + s16 tmp = cLib_addCalcAngleS(&field_0x612, -0x2800, 20, 500, 10); + if (tmp == 0) { dComIfGp_evmng_cutEnd(field_0x5bc); } calcMtx(); break; + } case 15: dComIfGp_evmng_cutEnd(field_0x5bc); calcMtx(); diff --git a/src/d/actor/d_a_door_mbossL1.cpp b/src/d/actor/d_a_door_mbossL1.cpp index 56f717c5fd..88937986bc 100644 --- a/src/d/actor/d_a_door_mbossL1.cpp +++ b/src/d/actor/d_a_door_mbossL1.cpp @@ -569,7 +569,7 @@ void daMBdoorL1_c::demoProc() { int level = getNowLevel(this); if (dComIfGp_evmng_getIsAddvance(field_0x5e8)) { switch (demoAction) { - case 0: + case 0: { int* puVar6 = dComIfGp_evmng_getMyIntegerP(field_0x5e8, "Timer"); if (puVar6 == NULL) { field_0x5ec = 1; @@ -577,6 +577,7 @@ void daMBdoorL1_c::demoProc() { field_0x5ec = *puVar6; } break; + } case 1: if (level == 5 || level == 11) { setAngleQuickly(); @@ -597,7 +598,7 @@ void daMBdoorL1_c::demoProc() { { unlockInit(); fopAcM_onSwitch(this, (u8)cVar10); - dComIfGp_setItemKeyNumCount(0xffffffff); + dComIfGp_setItemKeyNumCount(-1); fopAcM_seStart(this, Z2SE_OBJ_DOOR_CHAIN_LOCK_OPEN, 0); } break; diff --git a/src/d/actor/d_a_door_push.cpp b/src/d/actor/d_a_door_push.cpp index 6c9868596f..4d348b0db4 100644 --- a/src/d/actor/d_a_door_push.cpp +++ b/src/d/actor/d_a_door_push.cpp @@ -239,7 +239,7 @@ int daDoorPush_c::demoProc() { dComIfGp_evmng_getMyActIdx(field_0x644, action_table, ARRAY_SIZEU(action_table), 0, 0); if (dComIfGp_evmng_getIsAddvance(field_0x644) != 0) { switch (actIdx) { - case WAIT_e: + case WAIT_e: { int* integerP = dComIfGp_evmng_getMyIntegerP(field_0x644, "Timer"); if (integerP == NULL) { field_0x648 = 1; @@ -247,6 +247,7 @@ int daDoorPush_c::demoProc() { field_0x648 = *integerP; } break; + } case OPEN_e: rotateInit(); field_0x641 = 0; diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index 45677ae8e9..f689d3f209 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -131,7 +131,6 @@ int daDoor20_c::CreateHeap() { field_0x5a0.entry(mModel1->getModelData()); mModel2->calc(); } else { - switch (kind) { case 0: case 3: @@ -145,11 +144,14 @@ int daDoor20_c::CreateHeap() { case 1: anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpC.bck"); break; - case 2: - J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getStageRes(getBtk()); + case 2: + J3DAnmTextureSRTKey* pbtk; + pbtk = (J3DAnmTextureSRTKey*)dComIfG_getStageRes(getBtk()); 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)) { + if (field_0x5c0 == NULL || + !field_0x5c0->init(mModel1->getModelData(), pbtk, 1, 0, 1.0f, 0, -1)) + { return 0; } anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpD.bck"); @@ -820,17 +822,18 @@ int daDoor20_c::create() { int daDoor20_c::demoProc() { field_0x6cc = dComIfGp_evmng_getMyStaffId("SHUTTER_DOOR", 0, 0); int demoAction = getDemoAction(); + J3DAnmTransform* anm; if (dComIfGp_evmng_getIsAddvance(field_0x6cc)) { switch (demoAction) { - case 0: - int* pTimer = dComIfGp_evmng_getMyIntegerP( - field_0x6cc, "Timer"); + case 0: { + int* pTimer = dComIfGp_evmng_getMyIntegerP(field_0x6cc, "Timer"); if (pTimer == NULL) { field_0x5dd = 1; } else { field_0x5dd = *pTimer; } break; + } case 3: openInit(0); break; @@ -854,13 +857,14 @@ int daDoor20_c::demoProc() { keyhole->setOpen(); } } - int swBit = door_param2_c::getSwbit(this); + int swBit; + swBit = door_param2_c::getSwbit(this); if (swBit != 0xff && !dComIfGs_isSwitch(swBit, 0xffffffff) && (door_param2_c::getFrontOption(this) == 2 || door_param2_c::getBackOption(this) == 2)) { dComIfGs_onSwitch(swBit, 0xffffffff); - dComIfGp_setItemKeyNumCount(0xffffffff); + dComIfGp_setItemKeyNumCount(-1); if (field_0x673 == 1) { fopAcM_seStart(this, Z2SE_OBJ_DOOR_LOCK_OPEN, 0); } else { @@ -885,8 +889,7 @@ int daDoor20_c::demoProc() { setAngle(); break; case 13: - J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes( - getAlwaysArcName(), "FDoorB.bck"); + anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), "FDoorB.bck"); 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)) @@ -897,8 +900,7 @@ int daDoor20_c::demoProc() { openInit2(); break; case 12: - anm = - (J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), "FDoorA.bck"); + anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), "FDoorA.bck"); 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)) @@ -1102,7 +1104,7 @@ int daDoor20_c::demoProc() { case 25: dComIfGp_evmng_cutEnd(field_0x6cc); break; - case 26: + case 26: { int msgNo = door_param2_c::getMsgNo(this); if (door_param2_c::isMsgDoor(this) && msgNo != 0xffff) { dComIfGp_event_offHindFlag(1); @@ -1113,6 +1115,7 @@ int daDoor20_c::demoProc() { dComIfGp_evmng_cutEnd(field_0x6cc); } break; + } case 27: case 28: if (field_0x5c0->play()) { @@ -1678,7 +1681,8 @@ void daDoor20_c::makeEventId() { } break; case 4: - int j = 0; + int j; + j = 0; for (i = 12; i < 19; i++, j++) { field_0x692[i] = dComIfGp_getEventManager().getEventIdx(this, knob_table[j], field_0x6b8[i]); diff --git a/src/d/actor/d_a_e_bi.cpp b/src/d/actor/d_a_e_bi.cpp index 352d8a0e05..b0ff73a993 100644 --- a/src/d/actor/d_a_e_bi.cpp +++ b/src/d/actor/d_a_e_bi.cpp @@ -344,9 +344,10 @@ static void e_bi_ex(e_bi_class* i_this) { i_this->field_0x670 = 1; i_this->field_0x694 = 160; anm_init(i_this, BCK_BI_BOMBPOSE, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f); - f32 fVar1 = cM_rndF(0.2f) + 0.9f; + f32 fVar1; + fVar1 = cM_rndF(0.2f) + 0.9f; i_this->field_0x6a2 = 0; - i_this->field_0x6a4 = 3800.0f * fVar1; + i_this->field_0x6a4 = (3800.0f + JREG_F(5)) * fVar1; i_this->field_0x6a8 = fVar1 * 20.0f; a_this->speed.y = 23.0f; break; @@ -358,8 +359,8 @@ static void e_bi_ex(e_bi_class* i_this) { } // fallthrough case 2: - cLib_addCalc0(&i_this->field_0x6a8, 1.0f, 1.0f); - cLib_addCalcAngleS2(&i_this->field_0x6a4, 0, 1, 200); + cLib_addCalc0(&i_this->field_0x6a8, 1.0f, 1.0f + JREG_F(7)); + cLib_addCalcAngleS2(&i_this->field_0x6a4, 0, 1, 200 + JREG_S(6)); break; } @@ -374,13 +375,13 @@ static void e_bi_ex(e_bi_class* i_this) { if (i_this->field_0x694 != 0) { i_this->field_0x694--; i_this->mSound.startCreatureSoundLevel(Z2SE_OBJ_BOMB_IGNITION, 0, -1); - i_this->field_0x696 += 0x1100; + i_this->field_0x696 += (s16) 0x1100; if (i_this->field_0x694 < 45) { - i_this->field_0x696 += 0x1100; + i_this->field_0x696 += (s16) 0x1100; if (i_this->field_0x694 < 30) { - i_this->field_0x696 += 0x1100; + i_this->field_0x696 += (s16) 0x1100; } } diff --git a/src/d/actor/d_a_e_bu.cpp b/src/d/actor/d_a_e_bu.cpp index eb4ec7ba0f..d820bc4123 100644 --- a/src/d/actor/d_a_e_bu.cpp +++ b/src/d/actor/d_a_e_bu.cpp @@ -511,6 +511,7 @@ static void e_bu_path_fly(e_bu_class* i_this) { fopAc_ac_c* actor = &i_this->enemy; fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz sp18; + dPnt* pnt; switch (i_this->mode) { case 0: @@ -540,7 +541,7 @@ static void e_bu_path_fly(e_bu_class* i_this) { case 2: i_this->mode = 3; - dPnt* pnt = i_this->ppd->m_points; + pnt = i_this->ppd->m_points; pnt += i_this->now_path_pntNo; i_this->field_0x690 = TREG_F(7); diff --git a/src/d/actor/d_a_e_fz.cpp b/src/d/actor/d_a_e_fz.cpp index 9d86113350..28bf0a6c2b 100644 --- a/src/d/actor/d_a_e_fz.cpp +++ b/src/d/actor/d_a_e_fz.cpp @@ -502,6 +502,7 @@ void daE_FZ_c::executeAttack() { void daE_FZ_c::executeDamage() { cXyz pos; pos.set(l_HIO.field_0x0c, l_HIO.field_0x0c, l_HIO.field_0x0c); + f32 tmp; switch(mActionPhase) { case 0: @@ -519,7 +520,7 @@ void daE_FZ_c::executeDamage() { fopAcM_delete(this); break; case 1: - f32 tmp = l_HIO.field_0x28; + tmp = l_HIO.field_0x28; speedF = tmp; field_0x6fc = tmp; case 5: @@ -611,9 +612,7 @@ void daE_FZ_c::executeRollMove() { cXyz pos; s16 roll_angle = static_cast(mpBlizzetaActor)->getFrizadRollAngle(); - f32 mode_rarius = static_cast(mpBlizzetaActor)->getModeRarius(); - - mode_rarius = 100.0f + mode_rarius; + f32 mode_rarius = 100.0f + static_cast(mpBlizzetaActor)->getModeRarius(); if (mode_rarius < 400.0f) mode_rarius = 400.0f; @@ -636,9 +635,8 @@ void daE_FZ_c::executeRollMove() { pos.z += (f32)(mode_rarius * cM_scos(roll_angle + field_0x715 * 0xccc)); current.pos = pos; - u32 frizad_attack = static_cast(mpBlizzetaActor)->getFrizadAttack(); - if (frizad_attack == 3) { + if (static_cast(mpBlizzetaActor)->getFrizadAttack() == 3) { mActionPhase = 2; speedF = 60.0f; current.angle.y = cLib_targetAngleY(&static_cast(mpBlizzetaActor)->current.pos,¤t.pos); @@ -655,7 +653,8 @@ void daE_FZ_c::executeRollMove() { } if (mAtSph.ChkAtHit()) { - if ((fopAcM_GetName(mAtSph.GetAtHitAc()) == PROC_ALINK) || mAtSph.ChkAtShieldHit()) { + fopAc_ac_c* at_hit_actor = mAtSph.GetAtHitAc(); + if ((fopAcM_GetName(at_hit_actor) == PROC_ALINK) || mAtSph.ChkAtShieldHit()) { setActionMode(ACT_DAMAGE,0); return; } diff --git a/src/d/actor/d_a_e_ge.cpp b/src/d/actor/d_a_e_ge.cpp index ec46fbd893..745e3dbedb 100644 --- a/src/d/actor/d_a_e_ge.cpp +++ b/src/d/actor/d_a_e_ge.cpp @@ -659,6 +659,7 @@ void daE_GE_c::executeBack() { cXyz position; cXyz position2; s16 chaseAngle = 0x0; + s16 distAngleS; switch (mMode) { case 0: @@ -694,7 +695,7 @@ void daE_GE_c::executeBack() { position = calcCircleFly(&home.pos, &position2, field_0xb8c, field_0xb58, field_0xb8a, 1.0f); - s16 distAngleS = + distAngleS = cLib_distanceAngleS(cLib_targetAngleY(¤t.pos, &home.pos), shape_angle.y); if (position.y > 100.0f || mObjAcch.ChkWallHit() || distAngleS >= 0x5000) { field_0xb8c += 0x190; @@ -993,27 +994,26 @@ void daE_GE_c::executeWind() { } switch (mMode) { - case 0: + case 0: { field_0xb9e = 0; cXyz boomerangPos(daPy_py_c::getThrowBoomerangActor()->current.pos); field_0xb58 = current.pos.absXZ(boomerangPos); field_0xb5c = current.pos.y - boomerangPos.y; - speed.y = 0.0f; - speedF = 0.0f; + speedF = speed.y = 0.0f; mMode = 1; bckSet(9, 3.0f, 2, 1.0f); field_0xb64 = cM_rndFX(50.0f); field_0xb60 = cM_rndFX(100.0f); - + } /* fallthrough */ - case 1: + case 1: { if (mpMorfSO->checkFrame(0.0f)) { mSound.startCreatureVoice(Z2SE_EN_GE_V_FURA, -1); } cXyz boomerangPos2(daPy_py_c::getThrowBoomerangActor()->current.pos); - field_0xb8c += 0x800; + field_0xb8c += (s16)0x800; current.pos.x = boomerangPos2.x + field_0xb58 * cM_ssin(field_0xb8c); current.pos.z = boomerangPos2.z + field_0xb58 * cM_scos(field_0xb8c); cLib_chaseF(&field_0xb58, field_0xb60, 2.0f); @@ -1028,6 +1028,7 @@ void daE_GE_c::executeWind() { field_0xb8a = 0x3000; shape_angle.y += field_0xb8a; break; + } case 2: cLib_addCalcAngleS2(&field_0xb8a, 0, 4, 0x180); @@ -1042,7 +1043,6 @@ void daE_GE_c::executeWind() { setActionMode(ACTION_BACK); mMode = 10; } - break; } } diff --git a/src/d/actor/d_a_e_hz.cpp b/src/d/actor/d_a_e_hz.cpp index 668f31e5fb..ada079e8a9 100644 --- a/src/d/actor/d_a_e_hz.cpp +++ b/src/d/actor/d_a_e_hz.cpp @@ -679,13 +679,13 @@ void daE_HZ_c::initBackWalk() { } void daE_HZ_c::executeAway() { + f32 diff; switch (mMode) { case 0: gravity = 0.0f; speed.y = 0.0f; mSpheres[0].OffTgSetBit(); - shape_angle.z = 0; - shape_angle.x = 0; + shape_angle.x = shape_angle.z = 0; setBck(0xF, 0, 10.0f, 1.0f); field_0x6e4 = 1; mMode = 1; @@ -724,7 +724,7 @@ void daE_HZ_c::executeAway() { break; case 2: - f32 diff = (current.pos - field_0x678).absXZ(); + diff = (current.pos - field_0x678).absXZ(); cLib_chaseAngleS(&shape_angle.y, cLib_targetAngleY(¤t.pos, &field_0x678), diff < 500.0f ? (s16)0x800 : (s16)0x200); cLib_chaseF(&speedF, l_HIO.escape_speed, 1.0f); @@ -823,6 +823,8 @@ void daE_HZ_c::executeWind() { dBgS_LinChk linChk; BOOL bVar = false; f32 frame = mpMorfSO->getFrame(); + f32 playerDist; + f32 groundCross; mpBoomerangActor = daPy_py_c::getThrowBoomerangActor(); switch (mMode) { @@ -839,7 +841,7 @@ void daE_HZ_c::executeWind() { mMode = 1; field_0x6e4 = 0; - f32 playerDist = fopAcM_searchPlayerDistance(this); + playerDist = fopAcM_searchPlayerDistance(this); if (playerDist >= 1000.0f) { playerDist = 1000.0f; } @@ -927,7 +929,7 @@ void daE_HZ_c::executeWind() { cLib_chaseF(&field_0x678.x, 0.0f, 20.0f); gndChk.SetPos(&position); - f32 groundCross = dComIfG_Bgsp().GroundCross(&gndChk); + groundCross = dComIfG_Bgsp().GroundCross(&gndChk); if (frame < 38.0f) { if (position.y - groundCross < 500.0f) { position.y = groundCross + 500.0f; diff --git a/src/d/actor/d_a_e_kk.cpp b/src/d/actor/d_a_e_kk.cpp index 2ccfd3bc20..c1e0ebc77e 100644 --- a/src/d/actor/d_a_e_kk.cpp +++ b/src/d/actor/d_a_e_kk.cpp @@ -932,6 +932,9 @@ void daE_KK_c::executeWeaponMove() { current.angle.y = actor->shape_angle.y + 0x190; } + f32 temp; + f32 player_distance_y; + switch (mMoveMode) { case 0: shape_angle.x = home.angle.x + 0x878C; @@ -948,8 +951,7 @@ void daE_KK_c::executeWeaponMove() { mDistance = (fopAcM_searchPlayerDistance(this) - l_HIO.direct_attack_range) * 1.5f; - f32 temp = 2000.0f; - f32 player_distance_y; + temp = 2000.0f; if (fopAcM_searchPlayerDistanceY(this) < -300.0f) { player_distance_y = (fopAcM_searchPlayerDistanceY(this) + 300.0f) * -2.0f; diff --git a/src/d/actor/d_a_e_mm_mt.cpp b/src/d/actor/d_a_e_mm_mt.cpp index 75f2ff891d..9c5ec2d38f 100644 --- a/src/d/actor/d_a_e_mm_mt.cpp +++ b/src/d/actor/d_a_e_mm_mt.cpp @@ -207,7 +207,7 @@ static void e_mm_mt_carry(e_mm_mt_class* i_this) { fopAc_ac_c* player = (fopAc_ac_c*) dComIfGp_getPlayer(0); switch (i_this->m_mode) { - case 0: + case 0: { cLib_offBit(actor->attention_info.flags, fopAc_AttnFlag_CARRY_e); i_this->m_mode = 1; s16 angle_delta_y1 = 0x4000 + player->shape_angle.y; @@ -215,11 +215,11 @@ static void e_mm_mt_carry(e_mm_mt_class* i_this) { if (angle_delta_y > 0x4000 || angle_delta_y < -0x4000) { i_this->m_carryAngle = -0x8000; } else { - i_this->m_carryAngle = 0; + i_this->m_carryAngle = 0; } void(0); break; - + } case 1: if (!fopAcM_checkCarryNow(actor)) { i_this->m_action = 3; diff --git a/src/d/actor/d_a_e_nest.cpp b/src/d/actor/d_a_e_nest.cpp index 500bed3639..617b0dc8e1 100644 --- a/src/d/actor/d_a_e_nest.cpp +++ b/src/d/actor/d_a_e_nest.cpp @@ -3,8 +3,9 @@ * Enemy - Beehive */ -#include "d/dolzel_rel.h" // IWYU pragma: keep - + #include "d/dolzel_rel.h" // IWYU pragma: keep + +#include "d/d_s_play.h" #include "d/actor/d_a_e_nest.h" #include "d/actor/d_a_npc_tk.h" #include "SSystem/SComponent/c_math.h" @@ -431,13 +432,14 @@ static void e_nest_drop(e_nest_class* i_this) { } static s8 e_nest_carry(e_nest_class* i_this) { + fopAc_ac_c* a_this = static_cast(i_this); fopAc_ac_c* player = dComIfGp_getPlayer(0); - i_this->speed.y = 0.0f; + a_this->speed.y = 0.0f; s8 ret = true; - + switch (i_this->mMode) { - case 0: - cLib_offBit(i_this->attention_info.flags, fopAc_AttnFlag_CARRY_e); + case 0: { + cLib_offBit(a_this->attention_info.flags, fopAc_AttnFlag_CARRY_e); i_this->mMode = 1; s16 angle_delta_y = i_this->mRotation.y - player->shape_angle.y; if (angle_delta_y > 0x4000 || angle_delta_y < -0x4000) { @@ -447,21 +449,22 @@ static s8 e_nest_carry(e_nest_class* i_this) { } i_this->mTimers[0] = 20; break; + } case 1: - if (!fopAcM_checkCarryNow(i_this)) { + if (!fopAcM_checkCarryNow(a_this)) { i_this->mTimers[0] = 0; i_this->mCcSph.OnCoSetBit(); i_this->mAction = e_nest_class::ACT_DROP; - if (i_this->speedF >= 1.0f) { - i_this->speedF = 30.0f; - i_this->speed.y = 30.0f; - i_this->current.angle.y = player->shape_angle.y; + if (fopAcM_GetSpeedF(a_this) >= 1.0f) { + a_this->speedF = 30.0f + NREG_F(7); + a_this->speed.y = 30.0f + NREG_F(8); + a_this->current.angle.y = player->shape_angle.y; i_this->mMode = 0; } else { - i_this->speedF = 0.0f; + a_this->speedF = 0.0f; i_this->mMode = 3; - i_this->mWobble = 500.0f; + i_this->mWobble = 500.0f + NREG_F(0); } } else { ret = false; diff --git a/src/d/actor/d_a_e_sh.cpp b/src/d/actor/d_a_e_sh.cpp index f091d35a82..f1b1e51634 100644 --- a/src/d/actor/d_a_e_sh.cpp +++ b/src/d/actor/d_a_e_sh.cpp @@ -616,20 +616,20 @@ static void e_sh_disappear(e_sh_class* i_this) { int i; switch (i_this->field_0x678) { - case 0: + case 0: { anm_init(i_this, 12, 5.0f, 0, 1.0f); i_this->field_0x678 = 1; cXyz partScale(l_HIO.mBaseSize, l_HIO.mBaseSize, l_HIO.mBaseSize); for (i = 0; i < 2; i++) { - dComIfGp_particle_set(dp_name[i], &actor->current.pos, - &actor->shape_angle, &partScale); + dComIfGp_particle_set(dp_name[i], &actor->current.pos, &actor->shape_angle, &partScale); } i_this->mSound.startCreatureSound(Z2SE_EN_SH_DISAPPEAR, 0, -1); break; + } case 1: if (i_this->mAnm_p->isStop()) { i_this->field_0x676 = 0; diff --git a/src/d/actor/d_a_e_sw.cpp b/src/d/actor/d_a_e_sw.cpp index 8e8867f1a8..1beeea21d9 100644 --- a/src/d/actor/d_a_e_sw.cpp +++ b/src/d/actor/d_a_e_sw.cpp @@ -1762,7 +1762,7 @@ cPhs__Step daE_SW_c::create() { mBgc.OnLineCheck(); field_0x698 = 2; attention_info.distances[2] = 3; - d_setAction(daE_SW_c::d_wait); + d_setAction(&daE_SW_c::d_wait); } else { attention_info.distances[2] = 4; @@ -1826,7 +1826,7 @@ extern actor_process_profile_definition g_profile_E_SW = { }; void daE_SW_c::d_checkFall() { - if (d_checkAction(daE_SW_c::d_hook) || d_checkAction(daE_SW_c::d_fall) || d_checkAction(daE_SW_c::d_attk)) { + if (d_checkAction(&daE_SW_c::d_hook) || d_checkAction(&daE_SW_c::d_fall) || d_checkAction(&daE_SW_c::d_attk)) { return; } @@ -1843,7 +1843,7 @@ void daE_SW_c::d_checkFall() { if (speed.y < 0.0f) { if ((fVar1 == -G_CM3D_F_INF || std::abs(fVar1 - current.pos.y) > 1000.0f) || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 4 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 10 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 5) { - d_setAction(daE_SW_c::d_fall); + d_setAction(&daE_SW_c::d_fall); } } } @@ -1854,7 +1854,7 @@ void daE_SW_c::d_damage_check() { mStts.Move(); if (field_0x6f2 == 0) { - if (d_checkAction(daE_SW_c::d_damage) || d_checkAction(daE_SW_c::d_die)) { + if (d_checkAction(&daE_SW_c::d_damage) || d_checkAction(&daE_SW_c::d_die)) { return; } @@ -1862,7 +1862,7 @@ void daE_SW_c::d_damage_check() { field_0x98c.OffAtShieldHit(); if (player->checkPlayerGuard()) { - d_setAction(daE_SW_c::d_chance); + d_setAction(&daE_SW_c::d_chance); return; } } @@ -1897,22 +1897,22 @@ void daE_SW_c::d_damage_check() { player->getCutType() == daPy_py_c::CUT_TYPE_LARGE_JUMP_FINISH)) { health = 0; field_0x698 = 0; - d_setAction(daE_SW_c::d_damage); + d_setAction(&daE_SW_c::d_damage); } else if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_IRON_BALL) || mAtInfo.mpCollider->ChkAtType(AT_TYPE_BOMB) || mAtInfo.mpCollider->ChkAtType(AT_TYPE_MIDNA_LOCK)) { health = 0; field_0x698 = 0; - d_setAction(daE_SW_c::d_damage); + d_setAction(&daE_SW_c::d_damage); } else if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_HOOKSHOT)) { - d_setAction(daE_SW_c::d_hook); + d_setAction(&daE_SW_c::d_hook); } else if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_SHIELD_ATTACK) || mAtInfo.mpCollider->ChkAtType(AT_TYPE_40) || mAtInfo.mpCollider->ChkAtType(AT_TYPE_BOOMERANG)) { - if (!d_checkAction(daE_SW_c::d_chance2)) { - d_setAction(daE_SW_c::d_chance2); + if (!d_checkAction(&daE_SW_c::d_chance2)) { + d_setAction(&daE_SW_c::d_chance2); } } else { field_0x698--; - d_setAction(daE_SW_c::d_damage); + d_setAction(&daE_SW_c::d_damage); } } } @@ -1962,7 +1962,7 @@ void daE_SW_c::d_bm_chase() { fopAcM_SearchByID(field_0x688, (fopAc_ac_c**)&bomb); if (bomb == NULL || bomb->checkStateExplode()) { - d_setAction(daE_SW_c::d_wait); + d_setAction(&daE_SW_c::d_wait); } else { switch (mMoveMode) { case 0: @@ -1990,7 +1990,7 @@ void daE_SW_c::d_bm_chase() { } field_0x6a8 = bomb->current.pos; - d_setAction(daE_SW_c::d_attk); + d_setAction(&daE_SW_c::d_attk); return; default: @@ -2091,9 +2091,9 @@ void daE_SW_c::d_wait() { shape_angle.y = current.angle.y; if (d_bomb_check()) { - d_setAction(daE_SW_c::d_bm_chase); + d_setAction(&daE_SW_c::d_bm_chase); } else if (field_0x6ec == 0 && d_chaseCheck()) { - d_setAction(daE_SW_c::d_chase); + d_setAction(&daE_SW_c::d_chase); } } @@ -2140,17 +2140,17 @@ void daE_SW_c::d_chase() { setSmokeEffect(); if (field_0x6ee == 0) { - d_setAction(daE_SW_c::d_wait); + d_setAction(&daE_SW_c::d_wait); return; } if (player->current.pos.absXZ(current.pos) >= l_HIO.character_notice_dist) { - d_setAction(daE_SW_c::d_wait); + d_setAction(&daE_SW_c::d_wait); return; } if (player->current.pos.absXZ(current.pos) < l_HIO.human_attack_init_range) { - d_setAction(daE_SW_c::d_attk); + d_setAction(&daE_SW_c::d_attk); return; } @@ -2205,7 +2205,7 @@ void daE_SW_c::d_attk() { current.angle.y = sVar1; gravity = -4.0f; - if (d_checkOldAction(daE_SW_c::d_bm_chase)) { + if (d_checkOldAction(&daE_SW_c::d_bm_chase)) { field_0x69e = cLib_targetAngleY(¤t.pos, &field_0x6a8); speedF = current.pos.abs(field_0x6a8) / 25.0f; } else { @@ -2241,7 +2241,7 @@ void daE_SW_c::d_attk() { field_0x6d8 = -60.0f; if ((field_0x6bc & 1) == 0) { - d_setAction(daE_SW_c::d_chance); + d_setAction(&daE_SW_c::d_chance); } else { field_0x6e4 = 1; setDiveEffect(); @@ -2280,7 +2280,7 @@ void daE_SW_c::d_attk() { case 4: if ((field_0x6bc & 3) == 0) { - d_setAction(daE_SW_c::d_wait); + d_setAction(&daE_SW_c::d_wait); current.pos = old.pos; break; } else { @@ -2289,7 +2289,7 @@ void daE_SW_c::d_attk() { return; } - d_setAction(daE_SW_c::d_wait); + d_setAction(&daE_SW_c::d_wait); field_0x6d8 = -120.0f; cXyz sp30(current.pos); sp30.y += 200.0f; @@ -2324,7 +2324,7 @@ void daE_SW_c::d_chance() { bckSet(BCK_SW_CHANCE, 5.0f, 2, 1.0f); speedF = 0.0f; - if (d_checkOldAction(daE_SW_c::d_hook)) { + if (d_checkOldAction(&daE_SW_c::d_hook)) { field_0x6ea = 200; } else { field_0x6ea = 100; @@ -2366,7 +2366,7 @@ void daE_SW_c::d_chance() { } if (field_0x6ea == 0 && mBgc.ChkGroundHit() && field_0x6bc == 3) { - d_setAction(daE_SW_c::d_dive); + d_setAction(&daE_SW_c::d_dive); } break; } @@ -2390,7 +2390,7 @@ void daE_SW_c::d_chance2() { if (mBgc.ChkGroundHit()) { mSound.startCreatureSound(Z2SE_EN_SW_BTBT, field_0x6e9, -1); - d_setAction(daE_SW_c::d_chance); + d_setAction(&daE_SW_c::d_chance); } break; } @@ -2421,7 +2421,7 @@ void daE_SW_c::d_dive() { field_0x6e5 = 1; field_0x6d8 = -120.0f; - d_setAction(daE_SW_c::d_wait); + d_setAction(&daE_SW_c::d_wait); break; default: @@ -2490,11 +2490,11 @@ void daE_SW_c::d_damage() { speed.y = 0.0f; if (field_0x698 <= 0) { - d_setAction(daE_SW_c::d_die); + d_setAction(&daE_SW_c::d_die); return; } - d_setAction(daE_SW_c::d_chance); + d_setAction(&daE_SW_c::d_chance); return; default: @@ -2611,7 +2611,7 @@ void daE_SW_c::d_hook() { speedF = -10.0f; gravity = -5.0f; field_0x6d8 = 0.0f; - d_setAction(daE_SW_c::d_chance); + d_setAction(&daE_SW_c::d_chance); } break; diff --git a/src/d/actor/d_a_e_th.cpp b/src/d/actor/d_a_e_th.cpp index 9d1c8eac45..979d2d6ed4 100644 --- a/src/d/actor/d_a_e_th.cpp +++ b/src/d/actor/d_a_e_th.cpp @@ -818,13 +818,13 @@ static void demo_camera(e_th_class* i_this) { } } break; - case 10: + case 10: { if (!i_this->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(i_this, 2, 0xFFFF, 0); i_this->eventInfo.onCondition(2); return; } - + camera->mCamera.Stop(); i_this->mDemoCamMode = 11; i_this->mDemoCamTimer = 0; @@ -864,6 +864,7 @@ static void demo_camera(e_th_class* i_this) { anm_init(i_this, 0xE, 2.0f, 0, 1.0f); i_this->mMode = 1; dComIfGs_onSaveSwitch(94); + } case 11: if (i_this->mDemoCamTimer == 55 && i_this->field_0x567 != 0) { daPy_getPlayerActorClass()->changeDemoMode(0x17, 1, 2, 0); diff --git a/src/d/actor/d_a_e_tt.cpp b/src/d/actor/d_a_e_tt.cpp index df6a964e5e..fe64e2f3bc 100644 --- a/src/d/actor/d_a_e_tt.cpp +++ b/src/d/actor/d_a_e_tt.cpp @@ -964,7 +964,7 @@ void daE_TT_c::executeFirstAttack() { } break; - case 11: + case 11: { f32 playerSpeedF = player->getSpeedF() * 17.0f; cXyz xyz(playerSpeedF * cM_ssin(player->shape_angle.y), 0.0f, playerSpeedF * cM_scos(player->shape_angle.y)); @@ -992,6 +992,7 @@ void daE_TT_c::executeFirstAttack() { current.angle.y = shape_angle.y; } break; + } case 12: mSphere.OnAtSetBit(); diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index 5fcaa4c3b0..b014b59f73 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -1443,6 +1443,7 @@ void daE_VA_c::executeDemoOp() { camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp2C; cXyz sp38; + f32 old; daPy_py_c* player = daPy_getPlayerActorClass(); calcOpRopePos(); @@ -1664,7 +1665,7 @@ void daE_VA_c::executeDemoOp() { } sp38.set(26.0f, 187.0f, 236.0f); - f32 old = field_0x122c.y; + old = field_0x122c.y; if (cLib_chasePosXZ(&field_0x122c, sp38, 4.2f)) { field_0x122c.y = old; @@ -2304,7 +2305,7 @@ void daE_VA_c::executeOpaciFly() { case 0: case 20: case 21: - case 22: + case 22: { attention_info.flags = 0; if (mMode == 0) { @@ -2329,8 +2330,9 @@ void daE_VA_c::executeOpaciFly() { current.angle.y = temp_r0; mDemoModeTimer = nREG_S(0) + 15; + } /* fallthrough */ - case 1: + case 1: { if (mDemoModeTimer == 0 && !checkBck(ANM_FLOAT_WAIT_e)) { setBck(ANM_FLOAT_WAIT_e, J3DFrameCtrl::EMode_LOOP, nREG_F(19) + 30.0f, 1.0f); } @@ -2359,6 +2361,7 @@ void daE_VA_c::executeOpaciFly() { mMode = 2; } break; + } case 2: mMode = 3; mDemoModeTimer = 30; @@ -3063,7 +3066,7 @@ void daE_VA_c::calcMagicMove() { case 0: mMagicSphs[i].OffAtSetBit(); break; - case 1: + case 1: { mMagicSphs[i].OnAtSetBit(); field_0x1228[i] = 2; @@ -3084,6 +3087,7 @@ void daE_VA_c::calcMagicMove() { f32 temp_f31 = std::abs(cM_scos(sp8) * 50.0f); mMagicSpeed[i].set(temp_f31 * cM_ssin(spA), cM_ssin(sp8) * 50.0f, temp_f31 * cM_scos(spA)); + } /* fallthrough */ case 2: Z2GetAudioMgr()->seStartLevel(Z2SE_EN_VA_ATK_BALL, &mMagicPos[i], 0, 0, 1.0f, 1.0f, diff --git a/src/d/actor/d_a_e_yh.cpp b/src/d/actor/d_a_e_yh.cpp index 8587424bf7..7294aacb8f 100644 --- a/src/d/actor/d_a_e_yh.cpp +++ b/src/d/actor/d_a_e_yh.cpp @@ -662,45 +662,48 @@ static void e_yh_attack(e_yh_class* i_this) { i_this->mSound.startCreatureVoice(Z2SE_EN_DB_V_BITE, -1); } break; - - case 2: + + case 2: { if (i_this->field_0x698[1] != 0) { i_this->field_0xb18 = 1; } - - cLib_addCalc2(&a_this->current.pos.x, i_this->field_0x678.x, 0.8f, a_this->speed.x * i_this->field_0x690); - cLib_addCalc2(&a_this->current.pos.z, i_this->field_0x678.z, 0.8f, a_this->speed.z * i_this->field_0x690); - cLib_addCalc2(&a_this->current.pos.y, i_this->field_0x678.y, 0.8f, a_this->speed.y * i_this->field_0x690); + + cLib_addCalc2(&a_this->current.pos.x, i_this->field_0x678.x, 0.8f, + a_this->speed.x * i_this->field_0x690); + cLib_addCalc2(&a_this->current.pos.z, i_this->field_0x678.z, 0.8f, + a_this->speed.z * i_this->field_0x690); + cLib_addCalc2(&a_this->current.pos.y, i_this->field_0x678.y, 0.8f, + a_this->speed.y * i_this->field_0x690); cLib_addCalc2(&i_this->field_0x690, 0.2f, 1.0f, 0.05f); cLib_addCalcAngleS2(&a_this->shape_angle.z, i_this->field_0x864, 2, 0x2000); - + daPy_py_c* pdVar6 = (daPy_py_c*)daPy_getPlayerActorClass(); if (!pdVar6->getDkCaught()) { if (!pdVar6->getDkCaught2() && i_this->mAtSph.ChkAtHit()) { cCcD_Obj* hitObj = i_this->mAtSph.GetAtHitObj(); - + if (player == dCc_GetAc(hitObj->GetAc())) { OS_REPORT("E_DB//////////////AT SET 1 !!\n"); i_this->field_0x670 = 5; i_this->field_0x690 = 20.0f; anm_init(i_this, 8, 2.0f, 2, 1.0f); i_this->field_0x698[0] = 120; - + daPy_py_c* pyPlayer = (daPy_py_c*)daPy_getPlayerActorClass(); pyPlayer->setDkCaught(a_this); - - dComIfGp_getVibration().StartShock(6, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); + + dComIfGp_getVibration().StartShock(6, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); break; } } } - + if (i_this->mpMorf->isStop()) { i_this->field_0x670 = 3; i_this->field_0x698[0] = 0; } break; - + } case 3: if (i_this->field_0x698[0] == 0) { i_this->field_0x66e = 3; @@ -1350,8 +1353,8 @@ static s8 e_yh_escape(e_yh_class* i_this) { } } break; - - case 2: + + case 2: { local_bc = a_this->home.pos - a_this->current.pos; local_bc.y = 0.0f; s16 homeAngle = cM_atan2s(local_bc.x, local_bc.z); @@ -1363,7 +1366,8 @@ static s8 e_yh_escape(e_yh_class* i_this) { i_this->mSound.startCreatureSound(Z2SE_EN_DB_GRASS, 0, -1); } break; - + } + case 3: local_116 = 0; cLib_addCalc0(&i_this->field_0x844, 1.0f, 1.0f); diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index 4e1deb7275..35e3ba1803 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -92,7 +92,7 @@ static void dKy_event_proc() { env_light->dice_wether_state = DICE_STATE_INIT_e; } break; - case DICE_STATE_INIT_e: + case DICE_STATE_INIT_e: { u8 table_no = cM_rndF(12.99f); if (table_no >= 8) { env_light->dice_wether_state = DICE_STATE_NEXT_e; @@ -132,6 +132,7 @@ static void dKy_event_proc() { env_light->dice_wether_state++; } break; + } case DICE_STATE_EXEC_e: if (current_time > env_light->dice_wether_time && current_time - env_light->dice_wether_time < 180.0f) @@ -812,7 +813,7 @@ static void daKytag06_type_03_Execute(kytag06_class* i_this) { dComIfGs_onSwitch(i_this->mSwNo, dComIfGp_roomControl_getStayNo()); } break; - case 1: + case 1: { int old = i_this->field_0x578; i_this->field_0x578--; @@ -820,6 +821,7 @@ static void daKytag06_type_03_Execute(kytag06_class* i_this) { i_this->mMode++; } break; + } case 2: if ((g_Counter.mCounter0 & 7) == 0) { // run block every 8 frames @@ -861,7 +863,7 @@ static int daKytag06_Execute(kytag06_class* i_this) { dComIfGs_getTime(); switch (i_this->mType) { - case 1: + case 1: { camera_class* camera = dComIfGp_getCamera(0); if (i_this->mpPath != NULL) { @@ -899,6 +901,7 @@ static int daKytag06_Execute(kytag06_class* i_this) { } } break; + } case 2: if (i_this->mSwNo != 0xFF) { if (dComIfGs_isSwitch(i_this->mSwNo, dComIfGp_roomControl_getStayNo()) && i_this->mMode == 0) { @@ -1040,6 +1043,7 @@ static int daKytag06_Execute(kytag06_class* i_this) { } break; case 4: + void(0); break; } diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp index d8f10a0d5b..dd342f124e 100644 --- a/src/d/actor/d_a_npc_hoz.cpp +++ b/src/d/actor/d_a_npc_hoz.cpp @@ -594,7 +594,7 @@ BOOL daNpc_Hoz_c::evtEndProc() { field_0xf8b = 1; field_0xf8c = 0; break; - case 5: + case 5: { field_0xf8a = 1; field_0xf8c = 0; @@ -604,6 +604,7 @@ BOOL daNpc_Hoz_c::evtEndProc() { dMeter2Info_onMenuInForce(2); } break; + } case 6: field_0xf8b = 1; diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index 86a15fe481..ffe173521f 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -1139,6 +1139,7 @@ static int npc_ks_demo_02(npc_ks_class* i_this) { fopAc_ac_c* a_pill_p = pillar_p; switch (i_this->mMode) { + int _; case 0: anm_init(i_this, 26, 3.0f, 2, 1.0f); i_this->mMode = 1; diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp index 32bf3edab4..5e410ee76f 100644 --- a/src/d/actor/d_a_npc_ne.cpp +++ b/src/d/actor/d_a_npc_ne.cpp @@ -1201,7 +1201,7 @@ static void npc_ne_pathwalk(npc_ne_class* i_this) { i_this->mMode = 1; // fallthrough - case 1: + case 1: { i_this->mPathPointNo += i_this->mPathDir; if (i_this->mPathPointNo >= (i_this->mpPath->m_num & 0xff)) { if (dPath_ChkClose(i_this->mpPath)) { @@ -1222,7 +1222,7 @@ static void npc_ne_pathwalk(npc_ne_class* i_this) { i_this->mMode = 2; i_this->mAngleYStep = 0.0f; break; - + } case 2: i_this->mLookTarget = i_this->mTargetPos; cXyz delta = i_this->mTargetPos - i_this->current.pos; diff --git a/src/d/actor/d_a_npc_tkc.cpp b/src/d/actor/d_a_npc_tkc.cpp index 117388c6e1..1ec8a25c18 100644 --- a/src/d/actor/d_a_npc_tkc.cpp +++ b/src/d/actor/d_a_npc_tkc.cpp @@ -323,8 +323,8 @@ int daNpcTkc_c::Draw() { } int daNpcTkc_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { - int jntNo = i_joint->getJntNo(); - u16 jointNo = jointNo; + J3DJoint* joint = i_joint; + int jntNo = joint->getJntNo(); if ((jntNo == JNT_ARMR || jntNo == JNT_MOUTH) && (mAnmFlags & ANM_PLAY_BCK)) { J3DAnmTransform* anm = mBckAnm.getBckAnm(); mBckAnm.changeBckOnly(mAnm_p->getAnm()); diff --git a/src/d/actor/d_a_npc_uri.cpp b/src/d/actor/d_a_npc_uri.cpp index 6a6ac88058..19bd6160bc 100644 --- a/src/d/actor/d_a_npc_uri.cpp +++ b/src/d/actor/d_a_npc_uri.cpp @@ -417,7 +417,7 @@ void daNpc_Uri_c::reset() { cStack_a0.y = home.angle.y; switch (mType) { - case TYPE_1: + case TYPE_1: { mPath.setNextPathInfo(fopAcM_GetRoomNo(this), 0); int num = mPath.getNumPnts(); acStack_38 = mPath.getPntPos(num - 2); @@ -464,6 +464,7 @@ void daNpc_Uri_c::reset() { } } break; + } case TYPE_4: field_0x100d = 1; break; @@ -1232,7 +1233,7 @@ int daNpc_Uri_c::cutFindWolf(int param_1) { if (dComIfGp_getEventManager().getIsAddvance(param_1)) { switch (iVar11) { - case 0: + case 0: { mFaceMotionSeqMngr.setNo(12, 0.0f, 0, 0); mMotionSeqMngr.setNo(23, 0.0f, 0, 0); mSound.startCreatureVoice(JAISoundID(Z2SE_URI_V_SCREAM_S), -1); @@ -1256,6 +1257,7 @@ int daNpc_Uri_c::cutFindWolf(int param_1) { * night */ dComIfGs_onTmpBit(0x1308); break; + } case 1: fopAc_ac_c* actor = mActorMngr[0].getActorP(); if (actor) { diff --git a/src/d/actor/d_a_npc_zelRo.cpp b/src/d/actor/d_a_npc_zelRo.cpp index 670958223c..90e2d58dd7 100644 --- a/src/d/actor/d_a_npc_zelRo.cpp +++ b/src/d/actor/d_a_npc_zelRo.cpp @@ -628,7 +628,8 @@ int daNpc_ZelRo_c::talk(void* param_1) { #ifdef DEBUG int daNpc_ZelRo_c::test(void* param_1) { - + int rt = 0; + return rt; } #endif diff --git a/src/d/actor/d_a_obj_avalanche.cpp b/src/d/actor/d_a_obj_avalanche.cpp index a1c6488f5f..013ace1dc1 100644 --- a/src/d/actor/d_a_obj_avalanche.cpp +++ b/src/d/actor/d_a_obj_avalanche.cpp @@ -214,7 +214,7 @@ int daObjAvalanche_c::demoProc() { int actIdx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, 2, 0, 0); if (dComIfGp_evmng_getIsAddvance(mStaffId)) { switch (actIdx) { - case 0: + case 0: { int* puVar3 = dComIfGp_evmng_getMyIntegerP(mStaffId, "Timer"); if (puVar3 == NULL) { mTimer = 1; @@ -222,11 +222,13 @@ int daObjAvalanche_c::demoProc() { mTimer = *puVar3; } break; + } case 1: mBckAnm->setPlaySpeed(1.0f); eyePos = current.pos; fopAcM_seStart(this, Z2SE_OBJ_SNOW_SLIDE, 0); setEffect(); + OS_REPORT("崩れる雪：ＳＥセット\n"); // Avalanche: SE Set break; } } diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index 520c243bc3..13c8980ac9 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -1292,7 +1292,8 @@ int daObjCarry_c::create() { } #endif - int create_phase = cPhs_NEXT_e; + int create_phase; + create_phase = cPhs_NEXT_e; switch (mType) { case TYPE_BALL_S: diff --git a/src/d/actor/d_a_obj_enemy_create.cpp b/src/d/actor/d_a_obj_enemy_create.cpp index bba8ab84bb..2bad4cf956 100644 --- a/src/d/actor/d_a_obj_enemy_create.cpp +++ b/src/d/actor/d_a_obj_enemy_create.cpp @@ -54,7 +54,7 @@ void daObjE_CREATE_c::NormalAction() { mActionMode++; } break; - case MODE_KILL_CHECK: + case MODE_KILL_CHECK: { int killed_num; int enemyNum = mEnemyNum; @@ -68,14 +68,15 @@ void daObjE_CREATE_c::NormalAction() { if (killed_num == enemyNum) { mActionMode++; - if (mDeactivateSw != 0xFF && - !dComIfGs_isSwitch(mDeactivateSw, fopAcM_GetRoomNo(this))) { + if (mDeactivateSw != 0xFF && !dComIfGs_isSwitch(mDeactivateSw, fopAcM_GetRoomNo(this))) + { dComIfGs_onSwitch(mDeactivateSw, fopAcM_GetRoomNo(this)); } mKillCheckDelayTimer = 100; } break; + } case MODE_END: break; } diff --git a/src/d/actor/d_a_obj_kabuto.cpp b/src/d/actor/d_a_obj_kabuto.cpp index a6cf31ce20..7ce815ab13 100644 --- a/src/d/actor/d_a_obj_kabuto.cpp +++ b/src/d/actor/d_a_obj_kabuto.cpp @@ -117,13 +117,14 @@ static int daObjKABUTO_Delete(daObjKABUTO_c* i_this) { void daObjKABUTO_c::ShopWaitAction() { switch (mMode) { - case 0: + case 0: { speedF = 0.0f; J3DAnmTransform* anm = static_cast(dComIfG_getObjectRes("Kab_m", 7)); mpMorf->setAnm(anm, 2, 5.0f, 0.0f, 0.0f, -1.0f); mMode++; mTimers[0] = cM_rndF(50.0f) + 50.0f; break; + } case 1: mTimers[0]--; @@ -148,13 +149,14 @@ void daObjKABUTO_c::ShopWaitAction() { void daObjKABUTO_c::WaitAction() { switch (mMode) { - case 0: + case 0: { speedF = 0.0f; J3DAnmTransform* anm = static_cast(dComIfG_getObjectRes("Kab_m", 7)); mpMorf->setAnm(anm, 2, 5.0f, 0.0f, 0.0f, -1.0f); mMode++; mTimers[0] = cM_rndF(50.0f) + 50.0f; break; + } case 1: if (fopAcM_searchActorDistance(this, daPy_getPlayerActorClass()) < 1500.0f) { diff --git a/src/d/actor/d_a_obj_kgate.cpp b/src/d/actor/d_a_obj_kgate.cpp index 6f74edc5d3..9f1de606f2 100644 --- a/src/d/actor/d_a_obj_kgate.cpp +++ b/src/d/actor/d_a_obj_kgate.cpp @@ -872,7 +872,7 @@ void daObjKGate_c::demoProc() { if (dComIfGp_evmng_getIsAddvance(mStaffID)) { switch (demo_action) { - case DEMO_ACT_WAIT: + case DEMO_ACT_WAIT: { int* timer_p = dComIfGp_evmng_getMyIntegerP(mStaffID, "Timer"); if (timer_p == NULL) { mTimer = 1; @@ -880,6 +880,7 @@ void daObjKGate_c::demoProc() { mTimer = *timer_p; } break; + } case DEMO_ACT_OPEN: mGateLMove = 1000; mGateRMove = -1000; diff --git a/src/d/actor/d_a_obj_rgate.cpp b/src/d/actor/d_a_obj_rgate.cpp index 232ff2e225..2349c84a6d 100644 --- a/src/d/actor/d_a_obj_rgate.cpp +++ b/src/d/actor/d_a_obj_rgate.cpp @@ -765,7 +765,7 @@ void daObjRgate_c::demoProc() { if (dComIfGp_evmng_getIsAddvance(mStaffID)) { switch (demo_action) { - case DEMO_ACT_WAIT: + case DEMO_ACT_WAIT: { int* timer_p = dComIfGp_evmng_getMyIntegerP(mStaffID, "Timer"); if (timer_p == NULL) { mTimer = 1; @@ -773,6 +773,7 @@ void daObjRgate_c::demoProc() { mTimer = *timer_p; } break; + } case DEMO_ACT_OPEN: mGateLMove = 1000; mGateRMove = -1000; diff --git a/src/d/actor/d_a_obj_smgdoor.cpp b/src/d/actor/d_a_obj_smgdoor.cpp index 967ffaeba7..91d78bf6c0 100644 --- a/src/d/actor/d_a_obj_smgdoor.cpp +++ b/src/d/actor/d_a_obj_smgdoor.cpp @@ -162,7 +162,7 @@ int daObjSmgDoor_c::demoProc() { if (dComIfGp_evmng_getIsAddvance(mStaffId) != 0) { switch (demo_action) { - case 0: + case 0: { int* intP = dComIfGp_evmng_getMyIntegerP(mStaffId, "Timer"); if (intP == NULL) { field_0x5e9 = 1; @@ -170,6 +170,7 @@ int daObjSmgDoor_c::demoProc() { field_0x5e9 = *intP; } break; + } case 1: openInit(); break; diff --git a/src/d/actor/d_a_obj_swBallC.cpp b/src/d/actor/d_a_obj_swBallC.cpp index 639a6368dd..bee4c46181 100644 --- a/src/d/actor/d_a_obj_swBallC.cpp +++ b/src/d/actor/d_a_obj_swBallC.cpp @@ -187,7 +187,7 @@ int daObjSwBallC_c::demoProc() { player->onShieldBackBone(); if (dComIfGp_evmng_getIsAddvance(field_0x578)) { switch (uVar1) { - case 0: + case 0: { int* puVar4 = dComIfGp_evmng_getMyIntegerP(field_0x578, "Timer"); if (puVar4 == NULL) { field_0x580 = 1; @@ -195,6 +195,7 @@ int daObjSwBallC_c::demoProc() { field_0x580 = *puVar4; } break; + } case 1: field_0x574->setPlaySpeed(1.0f); break; diff --git a/src/d/actor/d_a_obj_ten.cpp b/src/d/actor/d_a_obj_ten.cpp index 4fe39620da..0cfb3c3e61 100644 --- a/src/d/actor/d_a_obj_ten.cpp +++ b/src/d/actor/d_a_obj_ten.cpp @@ -108,14 +108,14 @@ static int daObjTEN_Delete(daObjTEN_c* i_this) { void daObjTEN_c::WaitAction() { switch (field_0x5e9) { - case 0: + case 0: { speedF = 0.0f; J3DAnmTransform* anmTransform = (J3DAnmTransform*)dComIfG_getObjectRes("I_Ten", 7); - mMorf->setAnm(anmTransform, 2, 5.0f, 0.0f, 0.0f, - -1.0f); + mMorf->setAnm(anmTransform, 2, 5.0f, 0.0f, 0.0f, -1.0f); field_0x5e9++; field_0x5ea[0] = cM_rndF(50.0f) + 50.0f; break; + } case 1: if (fopAcM_searchPlayerDistance(this) < 1500.0f) { field_0x5ea[0]--; diff --git a/src/d/actor/d_a_obj_thashi.cpp b/src/d/actor/d_a_obj_thashi.cpp index ddc839117c..a63d633047 100644 --- a/src/d/actor/d_a_obj_thashi.cpp +++ b/src/d/actor/d_a_obj_thashi.cpp @@ -113,7 +113,7 @@ void daObjTHASHI_c::setBaseMtx() { break; case 1: case 2: - case 7: + case 7: { for (s16 i = 0; i < 10; i++) { mDoMtx_stack_c::transS(mCollectiveTrans[i]); mDoMtx_stack_c::ZXYrotM(mCollectiveRot[i]); @@ -132,6 +132,7 @@ void daObjTHASHI_c::setBaseMtx() { mDoMtx_stack_c::ZXYrotM(shape_angle); mThashi01Model->setBaseTRMtx(mDoMtx_stack_c::get()); break; + } case 3: for (s16 i = 0; i < 50; i++) { mDoMtx_stack_c::transS(mCollectiveTrans[i]); @@ -151,7 +152,7 @@ void daObjTHASHI_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); mThashi01Model->setBaseTRMtx(mDoMtx_stack_c::get()); - break; + return; } } diff --git a/src/d/actor/d_a_scene_exit2.cpp b/src/d/actor/d_a_scene_exit2.cpp index 437f136dde..49cff71bd5 100644 --- a/src/d/actor/d_a_scene_exit2.cpp +++ b/src/d/actor/d_a_scene_exit2.cpp @@ -97,7 +97,7 @@ int daScExit_c::demoProc() { if (dComIfGp_evmng_getIsAddvance(mStaffID)) { switch (act_id) { - case WAIT_e: + case WAIT_e: { int* timer_p = dComIfGp_evmng_getMyIntegerP(mStaffID, "Timer"); if (timer_p == NULL) { @@ -106,6 +106,7 @@ int daScExit_c::demoProc() { mTimer = *timer_p; } break; + } case START_e: fopAcM_seStart(this, Z2SE_SY_WARP_FADE, 0); attention_info.position.y = current.pos.y + 800.0f; diff --git a/src/d/actor/d_a_tag_TWgate.cpp b/src/d/actor/d_a_tag_TWgate.cpp index fedf39024c..9d4e465ceb 100644 --- a/src/d/actor/d_a_tag_TWgate.cpp +++ b/src/d/actor/d_a_tag_TWgate.cpp @@ -9,6 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/d_msg_object.h" #include "f_op/f_op_actor_mng.h" +#include "JSystem/JUtility/JUTAssert.h" struct daTagTWGate_zevParam { /* 0x00 */ char* mArcName; @@ -293,24 +294,21 @@ void daTagTWGate_c::executeDemoFilone3() { } switch (*cutName) { - case 0x30303031: + case 0x30303031: { int modelSts = downloadModels(); if (modelSts == 1) { dComIfGp_evmng_cutEnd(staffId); } else if (modelSts == -1) { - dComIfGp_setNextStage(l_zevParamTbl[mType].mStage, - l_zevParamTbl[mType].mPoint, - l_zevParamTbl[mType].mRoomNo, - l_zevParamTbl[mType].mLayer); + dComIfGp_setNextStage(l_zevParamTbl[mType].mStage, l_zevParamTbl[mType].mPoint, + l_zevParamTbl[mType].mRoomNo, l_zevParamTbl[mType].mLayer); } break; - case 0x30303032: + } + case 0x30303032: { if (dComIfGp_getEvent().chkFlag2(8)) { dComIfGp_getEvent().onSkipFade(); - dComIfGp_setNextStage(l_zevParamTbl[mType].mStage, - l_zevParamTbl[mType].mPoint, - l_zevParamTbl[mType].mRoomNo, - l_zevParamTbl[mType].mLayer); + dComIfGp_setNextStage(l_zevParamTbl[mType].mStage, l_zevParamTbl[mType].mPoint, + l_zevParamTbl[mType].mRoomNo, l_zevParamTbl[mType].mLayer); } u8 old_5e1 = field_0x5e1; @@ -323,7 +321,7 @@ void daTagTWGate_c::executeDemoFilone3() { mDoMtx_stack_c::transS(player->current.pos); mDoMtx_stack_c::YrotM(sxyz.y); mDoMtx_stack_c::transM(0.0f, 240.0f, -710.0f); - + cXyz pos; pos.x = mDoMtx_stack_c::get()[0][3]; pos.y = mDoMtx_stack_c::get()[1][3]; @@ -333,6 +331,7 @@ void daTagTWGate_c::executeDemoFilone3() { dComIfGp_evmng_cutEnd(staffId); } break; + } case 0x30303033: if (dComIfGp_getEvent().chkFlag2(8)) { dComIfGp_getEvent().onSkipFade(); @@ -482,32 +481,30 @@ void daTagTWGate_c::executeDemoOrdin3() { mpMorf->setPlaySpeed(1.0f); field_0x5e0 = 1; break; + default: + JUT_PANIC(829, "0"); + break; } + } switch(*cutName) { case '0001': - int downloadResult = downloadModels(); + int downloadResult; + downloadResult = downloadModels(); if (downloadResult == 1) { evtMng.cutEnd(staffId); } else if (downloadResult == -1) { - dComIfGp_setNextStage( - l_zevParamTbl[mType].mStage, - l_zevParamTbl[mType].mPoint, - l_zevParamTbl[mType].mRoomNo, - l_zevParamTbl[mType].mLayer); + dComIfGp_setNextStage(l_zevParamTbl[mType].mStage, l_zevParamTbl[mType].mPoint, + l_zevParamTbl[mType].mRoomNo, l_zevParamTbl[mType].mLayer); } break; case '0002': if (dComIfGp_getEvent().checkSkipEdge()) { dComIfGp_getEvent().onSkipFade(); - dComIfGp_setNextStage( - l_zevParamTbl[mType].mStage, - l_zevParamTbl[mType].mPoint, - l_zevParamTbl[mType].mRoomNo, - l_zevParamTbl[mType].mLayer); + dComIfGp_setNextStage(l_zevParamTbl[mType].mStage, l_zevParamTbl[mType].mPoint, + l_zevParamTbl[mType].mRoomNo, l_zevParamTbl[mType].mLayer); } - int dVar2 = daPy_py_c::checkNowWolf() ? 0x2e : 0x4a; - if (field_0x5e1++ == dVar2) { + if (field_0x5e1++ == (daPy_py_c::checkNowWolf() ? 0x2e : 0x4a)) { daPy_py_c* player = daPy_getPlayerActorClass(); cXyz cStack_30; csXyz cStack_38(0, fopAcM_GetShapeAngle_p(player)->y + 0x8000, 0); @@ -516,8 +513,8 @@ void daTagTWGate_c::executeDemoOrdin3() { mDoMtx_stack_c::transM(0.0f, 240.0f, -710.0f); mDoMtx_stack_c::multVecZero(&cStack_30); dComIfGp_particle_set(0x86c5, &cStack_30, &cStack_38, NULL); - Z2GetAudioMgr()->seStart(Z2SE_OBJ_DARK_GATE_RIPPLE, &cStack_30, 0, 0, - 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->seStart(Z2SE_OBJ_DARK_GATE_RIPPLE, &cStack_30, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); evtMng.cutEnd(staffId); } break; @@ -534,6 +531,9 @@ void daTagTWGate_c::executeDemoOrdin3() { evtMng.cutEnd(staffId); } break; + default: + JUT_PANIC(890, "0"); + break; } if (eventInfo.checkCommandDemoAccrpt() && mEventID != -1 && evtMng.endCheck(mEventID)) { @@ -668,32 +668,29 @@ void daTagTWGate_c::executeDemoRanail3() { mpMorf->setPlaySpeed(1.0f); field_0x5e0 = 1; break; + default: + JUT_PANIC(1099, "0"); + break; } } switch(*cutName) { - case '0001': - int downloadResult = downloadModels(); + case '0001': + int downloadResult; + downloadResult = downloadModels(); if (downloadResult == 1) { evtMng.cutEnd(staffId); } else if (downloadResult == -1) { - dComIfGp_setNextStage( - l_zevParamTbl[mType].mStage, - l_zevParamTbl[mType].mPoint, - l_zevParamTbl[mType].mRoomNo, - l_zevParamTbl[mType].mLayer); + dComIfGp_setNextStage(l_zevParamTbl[mType].mStage, l_zevParamTbl[mType].mPoint, + l_zevParamTbl[mType].mRoomNo, l_zevParamTbl[mType].mLayer); } break; case '0002': if (dComIfGp_getEvent().checkSkipEdge()) { dComIfGp_getEvent().onSkipFade(); - dComIfGp_setNextStage( - l_zevParamTbl[mType].mStage, - l_zevParamTbl[mType].mPoint, - l_zevParamTbl[mType].mRoomNo, - l_zevParamTbl[mType].mLayer); + dComIfGp_setNextStage(l_zevParamTbl[mType].mStage, l_zevParamTbl[mType].mPoint, + l_zevParamTbl[mType].mRoomNo, l_zevParamTbl[mType].mLayer); } - int dVar2 = daPy_py_c::checkNowWolf() ? 0x2e : 0x4a; - if (field_0x5e1++ == dVar2) { + if (field_0x5e1++ == (daPy_py_c::checkNowWolf() ? 0x2e : 0x4a)) { daPy_py_c* player = daPy_getPlayerActorClass(); cXyz cStack_30; csXyz cStack_38(0, fopAcM_GetShapeAngle_p(player)->y + 0x8000, 0); @@ -702,8 +699,8 @@ void daTagTWGate_c::executeDemoRanail3() { mDoMtx_stack_c::transM(0.0f, 240.0f, -710.0f); mDoMtx_stack_c::multVecZero(&cStack_30); dComIfGp_particle_set(0x86c5, &cStack_30, &cStack_38, NULL); - Z2GetAudioMgr()->seStart(Z2SE_OBJ_DARK_GATE_RIPPLE, &cStack_30, 0, 0, - 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->seStart(Z2SE_OBJ_DARK_GATE_RIPPLE, &cStack_30, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); evtMng.cutEnd(staffId); } break; @@ -720,6 +717,9 @@ void daTagTWGate_c::executeDemoRanail3() { evtMng.cutEnd(staffId); } break; + default: + JUT_PANIC(1160, "0"); + break; } if (eventInfo.checkCommandDemoAccrpt() && mEventID != -1 && evtMng.endCheck(mEventID)) { @@ -854,7 +854,8 @@ void daTagTWGate_c::executeDemoHyral3() { } switch(*piVar3) { case '0001': - int downloadRes = downloadModels(); + int downloadRes; + downloadRes = downloadModels(); if (downloadRes == 1) { eventMgr.cutEnd(staffId); } else if (downloadRes == -1) { diff --git a/src/d/actor/d_a_tag_kago_fall.cpp b/src/d/actor/d_a_tag_kago_fall.cpp index efa0bd63a9..d3b90f3458 100644 --- a/src/d/actor/d_a_tag_kago_fall.cpp +++ b/src/d/actor/d_a_tag_kago_fall.cpp @@ -136,7 +136,7 @@ void daTagKagoFall_c::actionWaitRiver() { } break; - case 4: + case 4: { daPy_getPlayerActorClass()->offNoResetFlg0(daPy_py_c::FLG0_UNK_10000); int msg = mMsgFlow.doFlow(this, NULL, 0); @@ -151,6 +151,7 @@ void daTagKagoFall_c::actionWaitRiver() { mActionState = 5; } break; + } case 5: // Maybe contained some stripped out debug code? @@ -233,7 +234,7 @@ void daTagKagoFall_c::actionWaitFall() { break; - case 3: + case 3: { player->setPlayerPosAndAngle(&mRestartPos, 0, 0); int msg = mMsgFlow.doFlow(this, NULL, 0); if (msg != 0) { @@ -247,6 +248,7 @@ void daTagKagoFall_c::actionWaitFall() { mActionState = 10; } break; + } case 10: // Maybe contained some stripped out debug code? diff --git a/src/d/actor/d_a_tag_river_back.cpp b/src/d/actor/d_a_tag_river_back.cpp index 7f14af3253..60f3931618 100644 --- a/src/d/actor/d_a_tag_river_back.cpp +++ b/src/d/actor/d_a_tag_river_back.cpp @@ -104,7 +104,7 @@ int daTagRiverBack_c::demoProc() { if (dComIfGp_evmng_getIsAddvance(mStaffID)) { switch (act_id) { - case WAIT_e: + case WAIT_e: { int* timer_p = dComIfGp_evmng_getMyIntegerP(mStaffID, "Timer"); if (timer_p == NULL) { mTimer = 1; @@ -112,6 +112,7 @@ int daTagRiverBack_c::demoProc() { mTimer = *timer_p; } break; + } case SCENE_CHG_e: mDoAud_seStart(Z2SE_FORCE_BACK, 0, 0, 0); } diff --git a/src/d/actor/d_a_tag_statue_evt.cpp b/src/d/actor/d_a_tag_statue_evt.cpp index 00aacbd199..538420e3ff 100644 --- a/src/d/actor/d_a_tag_statue_evt.cpp +++ b/src/d/actor/d_a_tag_statue_evt.cpp @@ -1,6 +1,6 @@ /* -/* Translation Unit: d_a_tag_statue_evt -/* Owl Statue Event Tag -- Awarding Sky Characters +* Translation Unit: d_a_tag_statue_evt +* Owl Statue Event Tag -- Awarding Sky Characters */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -272,18 +272,18 @@ int daTagStatue_c::demoProc() { if(dComIfGp_evmng_getIsAddvance(mStaffId)) { switch(act_id) { - case DEMO_ACTION_WAIT: + case DEMO_ACTION_WAIT: { // Delay fading to black int* timer_p = dComIfGp_evmng_getMyIntegerP(mStaffId, "Timer"); - if(!timer_p) { + if (!timer_p) { mTimer = 1; - } - else { + } else { mTimer = *timer_p; } break; + } case DEMO_ACTION_MOVE_OWL_STATUE: // Position and orient Owl Statue behind player if(mSkyCharacterEventBitIdIndex != TAG_LOCATION_GERUDO_DESERT && mSkyCharacterEventBitIdIndex != TAG_LOCATION_LAKE_HYLIA && mSkyCharacterEventBitIdIndex != TAG_LOCATION_RUINED_THEATRE) { diff --git a/src/d/d_msg_flow.cpp b/src/d/d_msg_flow.cpp index 2524fd337e..a2cd304fd7 100644 --- a/src/d/d_msg_flow.cpp +++ b/src/d/d_msg_flow.cpp @@ -581,7 +581,7 @@ int dMsgFlow_c::messageNodeProc(fopAc_ac_c* i_speaker_p, fopAc_ac_c** i_talkPart field_0x41 = 1; mNowMsgNo = aMsg_p->msg_idx; break; - case 6: + case 6: { field_0x40 = field_0x41; int mesgAnimeAttrInfo = -1; @@ -603,6 +603,7 @@ int dMsgFlow_c::messageNodeProc(fopAc_ac_c* i_speaker_p, fopAc_ac_c** i_talkPart field_0x41 = 0; mNowMsgNo = aMsg_p->msg_idx; break; + } case 14: case 18: setNodeIndex(flowNode_p->next_node_idx, i_talkPartners); @@ -635,7 +636,7 @@ int dMsgFlow_c::eventNodeProc(fopAc_ac_c* i_speaker_p, fopAc_ac_c** i_talkPartne int proc_status = (this->*mEventList[node->event_idx])(node, i_speaker_p); switch (node->event_idx) { - case 8: + case 8: { getParam(&mEventId, &field_0x30, node->params); setNodeIndex(mFlowIdxTBL[node->next_node_idx], i_talkPartners); @@ -647,6 +648,7 @@ int dMsgFlow_c::eventNodeProc(fopAc_ac_c* i_speaker_p, fopAc_ac_c** i_talkPartne setNodeIndex(-1, i_talkPartners); mNodeIdx = prev_idx; break; + } case 9: if (getParam(node->params) == 0) { int msgNum;