falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup

This commit is contained in:
TakaRikka 2025-07-28 17:53:42 -07:00
parent 255942f060
commit 1d65dc3504
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/d/actor/d_a_obj_warp_kbrg.cpp
View File

@ -314,7 +314,7 @@ void daObjWarpKBrg_c::event_proc_call() {
(this->*l_func[mAction])(); (this->*l_func[mAction])();
if (!eventInfo.chkCondition(1)) { if (!eventInfo.chkCondition(dEvtCnd_CANTALK_e)) {
field_0x69a = 0; field_0x69a = 0;
} }
} }
@ -325,7 +325,7 @@ void daObjWarpKBrg_c::orderZHintEvent() {
daPy_py_c* player_p = daPy_getPlayerActorClass(); daPy_py_c* player_p = daPy_getPlayerActorClass();
if (checkTalkDistance()) { if (checkTalkDistance()) {
eventInfo.onCondition(1); eventInfo.onCondition(dEvtCnd_CANTALK_e);
if (!player_p->checkPlayerFly()) { if (!player_p->checkPlayerFly()) {
dComIfGp_att_ZHintRequest(this, 0x1FF); dComIfGp_att_ZHintRequest(this, 0x1FF);
@ -406,7 +406,7 @@ void daObjWarpKBrg_c::actionOrderATalkEvent() {
} else if (checkTalkDistance()) { } else if (checkTalkDistance()) {
midna_p->onTagWaitPosPortalObj(&mMidnaWaitPos); midna_p->onTagWaitPosPortalObj(&mMidnaWaitPos);
dComIfGp_TargetWarpPt_set(3); dComIfGp_TargetWarpPt_set(3);
eventInfo.onCondition(1); eventInfo.onCondition(dEvtCnd_CANTALK_e);
attention_info.flags = 0xA; attention_info.flags = 0xA;
} else { } else {
midna_p->offTagWaitPos(); midna_p->offTagWaitPos();

6
src/d/actor/d_a_obj_warp_obrg.cpp
View File

@ -222,7 +222,7 @@ void daObjWarpOBrg_c::event_proc_call() {
(this->*l_func[mAction])(); (this->*l_func[mAction])();
if (!eventInfo.chkCondition(1)) { if (!eventInfo.chkCondition(dEvtCnd_CANTALK_e)) {
field_0x639 = 0; field_0x639 = 0;
} }
} }
@ -241,9 +241,9 @@ void daObjWarpOBrg_c::actionWait() {
setAction(ACTION_TALK_EVENT_e); setAction(ACTION_TALK_EVENT_e);
} }
} else if (fopAcM_isSwitch(this, getSwNo2()) && checkTalkDistance()) { } else if (fopAcM_isSwitch(this, getSwNo2()) && checkTalkDistance()) {
eventInfo.onCondition(1); eventInfo.onCondition(dEvtCnd_CANTALK_e);
if (!daPy_getPlayerActorClass()->checkPlayerFly()) { if (!daPy_getPlayerActorClass()->checkPlayerFly()) {
dComIfGp_att_ZHintRequest(this, 0x1FF); dComIfGp_att_ZHintRequest(this, 0x1FF);
if (field_0x639 == 0) { if (field_0x639 == 0) {
field_0x639 = 1; field_0x639 = 1;