diff options
| author | YunataSavior <58997725+YunataSavior@users.noreply.github.com> | 2025-09-20 12:09:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-20 22:09:06 +0300 |
| commit | affd5d7f95da627b2d2ebaf5a7d34878f15fc9ab (patch) | |
| tree | 186894608b5c3e393c8863938676e8d6b5c0858c /src/d/actor/d_a_npc_henna.cpp | |
| parent | 72236276a6af973baefd612f0a3d4fecccbab4e9 (diff) | |
d_a_obj_kanban2 & more OK (#2674)
* d_a_obj_kanban2 OK via gameInfo fakematch
Closes #1001
* Mark d_a_obj_kanban2 as matching for JP
* Mark npc_jagar as Matching
* d_a_tag_allmato OK via gameInfo fake match
* d_a_obj_wchain OK
* d_a_obj_so OK
---------
Co-authored-by: Max Roncace <me@caseif.net>
Diffstat (limited to 'src/d/actor/d_a_npc_henna.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_henna.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index 65b42b5e5e..525a8f004d 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -2219,10 +2219,15 @@ static void message_guide(npc_henna_class* i_this) { return; } - // TODO: fake match to force reuse of pointer +#if VERSION != VERSION_SHIELD_DEBUG + // TODO: gameInfo fake match to force reuse of pointer dComIfG_play_c* play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck()) { - if (actor->eventInfo.checkCommandTalk() == 0) { + if (play->getEvent().runCheck()) +#else + if (dComIfGp_event_runCheck()) +#endif + { + if (!actor->eventInfo.checkCommandTalk()) { return; } @@ -2251,7 +2256,11 @@ static void message_guide(npc_henna_class* i_this) { } if (i_this->mMsgFlow.doFlow(actor, NULL, 0) != 0) { +#if VERSION != VERSION_SHIELD_DEBUG play->getEvent().reset(); +#else + dComIfGp_event_reset(); +#endif i_this->mIsTalking = 0; } } else { |