mirror of
https://github.com/zeldaret/tww.git
synced 2026-07-30 07:45:16 -04:00
d_item 40%
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user