mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-19 13:03:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

b_gnd equivalent (#2340)

Browse Source 
* b_gnd equivalent

* fix dEvt_info_c inlines

* fix some more inlines
This commit is contained in:
TakaRikka
2025-03-23 12:55:28 -07:00
committed by GitHub
parent 4dc0cd9d09
commit a4cdad86f4
178 changed files with 4611 additions and 5262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_zra.cpp
+4 -4
View File
@@ -990,7 +990,7 @@ void daNpc_zrA_c::setParam() {
selectAction();
if (!mTwilight && daPy_py_c::i_checkNowWolf()) {
if (!mTwilight && daPy_py_c::checkNowWolf()) {
attn_flags = 0;
}
@@ -1067,7 +1067,7 @@ BOOL daNpc_zrA_c::main() {
orderEvent(mOrderSpeakEvt, l_evtNames[l_evtGetParamList[mOrderEvtNo].fileIdx],
0xffff, 4, 0xff, 2);
if (!mTwilight && mType == TYPE_WAIT && !field_0x1550) {
eventInfo.i_onCondition(dEvtCnd_CANTALKITEM_e);
eventInfo.onCondition(dEvtCnd_CANTALKITEM_e);
}
}
@@ -2163,7 +2163,7 @@ BOOL daNpc_zrA_c::doEvent() {
if (dComIfGp_event_runCheck() != false) {
dEvent_manager_c& event_manager = dComIfGp_getEventManager();
if (eventInfo.checkCommandTalk() || eventInfo.i_checkCommandDemoAccrpt()) {
if (eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) {
mOrderNewEvt = false;
}
@@ -2237,7 +2237,7 @@ BOOL daNpc_zrA_c::doEvent() {
ret = true;
}
if (eventInfo.i_checkCommandDemoAccrpt()) {
if (eventInfo.checkCommandDemoAccrpt()) {
if (mEventIdx != -1 && event_manager.endCheck(mEventIdx)) {
switch (mOrderEvtNo) {
case EVT_TALK_SWIM: