diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-03-23 12:55:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-23 21:55:28 +0200 |
| commit | a4cdad86f4eb28df25708e8b4b1988148f690f2e (patch) | |
| tree | be0399dac50abe47e0d5d718a9fe9bdbffcbf474 /src/d/actor/d_a_npc_the.cpp | |
| parent | 4dc0cd9d09d5a53bf6d68f0018a8053a1507ee9a (diff) | |
b_gnd equivalent (#2340)
* b_gnd equivalent
* fix dEvt_info_c inlines
* fix some more inlines
Diffstat (limited to 'src/d/actor/d_a_npc_the.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_the.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp index 1f358f0224..33288a31de 100644 --- a/src/d/actor/d_a_npc_the.cpp +++ b/src/d/actor/d_a_npc_the.cpp @@ -1388,7 +1388,7 @@ BOOL daNpcThe_c::main() { eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo]]); } if (!strcmp(dComIfGp_getStartStageName(), "R_SP116")) { - eventInfo.i_onCondition(0x20); + eventInfo.onCondition(0x20); } orderEvent(field_0xe1c, l_evtNames[mOrderEvtNo], 0xffff, 0x28, 0xff, 1); } @@ -1494,7 +1494,7 @@ BOOL daNpcThe_c::doEvent() { } ret = true; } - if (eventInfo.i_checkCommandDemoAccrpt() && mEventIdx != -1 + if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1 && event_manager.endCheck(mEventIdx)) { dComIfGp_event_reset(); mOrderEvtNo = 0; |