d_item 40%

This commit is contained in:
LagoLunatic
2023-10-16 18:02:13 -04:00
parent 3d0382e9ca
commit 7a182dda66
7 changed files with 251 additions and 180 deletions
+3 -3
View File
@@ -666,9 +666,9 @@ BOOL daArrow_c::procMove() {
if (hitActor) {
JntHit_c* jntHit = fopAcM_GetJntHit(hitActor);
if (mArrowType == TYPE_LIGHT) {
if (fpcM_GetName(mCps.GetAtHitAc()) == PROC_BGN
|| fpcM_GetName(mCps.GetAtHitAc()) == PROC_BGN2
|| fpcM_GetName(mCps.GetAtHitAc()) == PROC_BGN3) {
if (fpcM_GetName(mCps.GetAtHitAc()) == PROC_BGN ||
fpcM_GetName(mCps.GetAtHitAc()) == PROC_BGN2 ||
fpcM_GetName(mCps.GetAtHitAc()) == PROC_BGN3) {
// Hit Puppet Ganon.
if (hitWasBlocked) {
field_0x6a8 = hitPos;
+2 -2
View File
@@ -1307,8 +1307,8 @@ void daItem_c::mode_wait() {
break;
}
if (mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > current.pos.y
|| (daSea_ChkArea(current.pos.x, current.pos.z) && daSea_calcWave(current.pos.x, current.pos.z) > current.pos.y))
if (mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > current.pos.y ||
(daSea_ChkArea(current.pos.x, current.pos.z) && daSea_calcWave(current.pos.x, current.pos.z) > current.pos.y))
{
mode_water_init();
}
+2 -2
View File
@@ -269,8 +269,8 @@ BOOL daMbdoor_c::CreateInit() {
mCurActionIdx = 1;
field_0x2b0 = 0;
field_0x2b2 = 0;
} else if ((type == 0 && (swbit != 0xFF && !dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(this))))
|| (type == 1 && (swbit == 0xFF || dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(this))))) {
} else if ((type == 0 && (swbit != 0xFF && !dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(this)))) ||
(type == 1 && (swbit == 0xFF || dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(this))))) {
mCurActionIdx = 1;
field_0x2b0 = 0;
field_0x2b2 = 0;
+229 -170
View File
File diff suppressed because it is too large Load Diff