diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-10-17 21:35:18 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-10-17 21:35:18 -0400 |
| commit | 34afbd84db8d66dd634fa19e94a737d40dfe7995 (patch) | |
| tree | fb950a75f3928b8283874b277a9ab9baf1345392 /src/d/actor/d_a_item.cpp | |
| parent | f1d73f7fc721e957303d4e6541ec165c3ad9aea5 (diff) | |
clangd: Started fixing warnings and errors, code cleanup
Diffstat (limited to 'src/d/actor/d_a_item.cpp')
| -rw-r--r-- | src/d/actor/d_a_item.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp index 76e6b60d..11b4b78b 100644 --- a/src/d/actor/d_a_item.cpp +++ b/src/d/actor/d_a_item.cpp @@ -657,20 +657,22 @@ void daItem_c::itemGetExecute() { case dItem_DEKU_LEAF_e: mItemStatus = STATUS_INIT_GET_DEMO; break; - case SWORD: + case SWORD: { daItem_c* item = (daItem_c*)fopAcM_SearchByName(PROC_ITEM); if (item && item->m_itemNo == SHIELD) { item->itemGetExecute(); } mItemStatus = STATUS_INIT_GET_DEMO; break; - case SHIELD: - item = (daItem_c*)fopAcM_SearchByName(PROC_ITEM); + } + case SHIELD: { + daItem_c* item = (daItem_c*)fopAcM_SearchByName(PROC_ITEM); if (item && item->m_itemNo == SWORD) { item->itemGetExecute(); } mItemStatus = STATUS_INIT_GET_DEMO; break; + } case DROPPED_SWORD: mItemStatus = STATUS_INIT_GET_DEMO; break; @@ -1333,12 +1335,13 @@ BOOL daItem_c::initAction() { scale.set(mScaleTarget.x, mScaleTarget.y, mScaleTarget.z); switch (mAction) { - case 4: + case 4: { current.angle.y = cM_rndF((f32)0xFFFF); f32 temp = getData()->field_0x2C + cM_rndF(5.0f); speedF = cM_rndF(getData()->field_0x30); speed.set(0.0f, temp, 0.0f); break; + } case 5: speed.setall(0.0f); speedF = 0.0f; |