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

minor actor cleanup

Browse Source
This commit is contained in:
LagoLunatic
2024-01-23 04:25:43 -05:00
parent 4ca50bb60f
commit 2db5435315
7 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_disappear.cpp
+7 -8
View File
@@ -42,7 +42,7 @@ static BOOL daDisappear_Execute(disappear_class* i_this) {
}
}
else {
fopAcM_createIball(&i_this->current.pos, i_this->mItemTableIdx, i_this->current.roomNo, &i_this->current.angle, i_this->mSwitchNo);
fopAcM_createIball(&i_this->current.pos, i_this->mItemTableIdx, i_this->current.roomNo, &i_this->current.angle, i_this->mItemBitNo);
}
}
}
@@ -102,17 +102,16 @@ static s32 daDisappear_Create(fopAc_ac_c* i_this) {
fopAcM_SetupActor(dis, disappear_class);
u32 params = dis->mBase.mParameters;
dis->mHealth = fopAcM_GetParam(dis) & 0xFF;
f32 scale = ((fopAcM_GetParam(dis) >> 8) & 0xFF) * 0.1f;
dis->mHealth = dis->mBase.mParameters & 0xFF;
float scale = ((dis->mBase.mParameters >> 8) & 0xFF) * 0.1f;
dis->mSwitchNo = (dis->mBase.mParameters >> 0x10) & 0xFF;
if (dis->mSwitchNo == 0xFF) {
dis->mSwitchNo = -1;
dis->mItemBitNo = (fopAcM_GetParam(dis) >> 0x10) & 0xFF;
if (dis->mItemBitNo == 0xFF) {
dis->mItemBitNo = -1;
}
set_disappear(dis, scale);
return cPhs_COMPLEATE_e;
}