diff --git a/src/d/actor/d_a_npc_tks.cpp b/src/d/actor/d_a_npc_tks.cpp index 7d1dd47aa90..b60efb4595b 100644 --- a/src/d/actor/d_a_npc_tks.cpp +++ b/src/d/actor/d_a_npc_tks.cpp @@ -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); } diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp index e17487dd4e7..836f68d71da 100644 --- a/src/d/actor/d_a_obj_iceblock.cpp +++ b/src/d/actor/d_a_obj_iceblock.cpp @@ -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); } diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index f2d4efa6177..901b3f42101 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -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); } }