clangd: Started fixing warnings and errors, code cleanup

This commit is contained in:
LagoLunatic
2024-10-17 21:35:18 -04:00
parent f1d73f7fc7
commit 34afbd84db
58 changed files with 417 additions and 316 deletions
+7 -4
View File
@@ -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;