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

Fix wrong enum usage

This commit is contained in:
LagoLunatic 2025-12-23 17:17:46 -05:00
parent 48d2d599f7
commit 3572d6c3f2
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/d/actor/d_a_npc_tks.cpp
View File

@ -1035,7 +1035,7 @@ void daNpcTks_c::waitNude() {
if (fVar1 > -200.0f && fVar1 < 150.0f && fopAcM_searchPlayerDistanceXZ(this) <= 300.0f) {
if (!fopAcM_otherBgCheck(this, daPy_getPlayerActorClass())) {
eventInfo.onCondition(dEvtCmd_INTALK_e);
eventInfo.onCondition(dEvtCnd_CANTALK_e);
fopAcM_orderSpeakEvent(this, 0, 0);
}
}
@ -1089,7 +1089,7 @@ void daNpcTks_c::waitLv6() {
if (current.pos.y - fopAcM_GetPosition_p(daPy_getPlayerActorClass())->y < 100.0f && fopAcM_searchPlayerDistanceXZ(this) <= 400.0f) {
attention_info.flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e;
eventInfo.onCondition(dEvtCmd_INTALK_e);
eventInfo.onCondition(dEvtCnd_CANTALK_e);
fopAcM_orderSpeakEvent(this, 0, 0);
}

4
src/d/actor/d_a_obj_iceblock.cpp
View File

@ -739,7 +739,7 @@ void daObjIceBlk_c::actionWait() {
if (mMode == MODE_PROC_WALK_e && mWalkType == WALK_PUSH) {
setAction(ACTION_ORDER_EVENT_e);
fopAcM_orderPotentialEvent(this, 2, 0, 0);
eventInfo.onCondition(fopAcCnd_NOEXEC_e);
eventInfo.onCondition(dEvtCnd_CANDEMO_e);
}
}
@ -752,7 +752,7 @@ void daObjIceBlk_c::actionOrderEvent() {
camera->mCamera.SetTrimSize(1);
} else if (mMode == MODE_PROC_WALK_e) {
fopAcM_orderPotentialEvent(this, 2, 0, 0);
eventInfo.onCondition(fopAcCnd_NOEXEC_e);
eventInfo.onCondition(dEvtCnd_CANDEMO_e);
} else {
setAction(ACTION_WAIT_e);
}

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

@ -675,7 +675,7 @@ void daObjSwpush::Act_c::demo_reqPause_init() {
if (mDemoMode == DEMO_MODE_NON) {
mDemoMode = DEMO_MODE_REQ_PAUSE;
fopAcM_orderPotentialEvent(this, 2, 0, 0);
eventInfo.onCondition(fopAcCnd_NOEXEC_e);
eventInfo.onCondition(dEvtCnd_CANDEMO_e);
}
}
@ -718,7 +718,7 @@ void daObjSwpush::Act_c::demo_reqSw_init() {
demo_stop_puase();
mDemoMode = DEMO_MODE_REQ_SW;
fopAcM_orderOtherEventId(this, mEventID, prm_get_evId(), 0xFFFF, 0, 1);
eventInfo.onCondition(fopAcCnd_NOEXEC_e);
eventInfo.onCondition(dEvtCnd_CANDEMO_e);
}
}
@ -727,7 +727,7 @@ void daObjSwpush::Act_c::demo_reqSw() {
demo_runSw_init();
} else {
fopAcM_orderOtherEventId(this, mEventID, prm_get_evId(), 0xFFFF, 0, 1);
eventInfo.onCondition(fopAcCnd_NOEXEC_e);
eventInfo.onCondition(dEvtCnd_CANDEMO_e);
}
}