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

d_a_obj_kanban2 & more OK (#2674)

Browse Source 
* 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>
This commit is contained in:
YunataSavior
2025-09-20 12:09:06 -07:00
committed by GitHub
parent 72236276a6
commit affd5d7f95
13 changed files with 131 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_henna.cpp
+12 -3
View File
@@ -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 {