mirror of
https://github.com/zeldaret/tp
synced 2026-06-20 08:13:23 -04:00
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>
This commit is contained in:
@@ -1002,9 +1002,20 @@ void daObj_Kanban2_c::executeNormal() {
|
||||
break;
|
||||
case 1:
|
||||
mInvulnerabilityTimer = 3;
|
||||
if (dComIfGp_event_runCheck() && eventInfo.checkCommandTalk()) {
|
||||
#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() && eventInfo.checkCommandTalk())
|
||||
#else
|
||||
if (dComIfGp_event_runCheck() && eventInfo.checkCommandTalk())
|
||||
#endif
|
||||
{
|
||||
if (mMsgFlow.doFlow(this, NULL, 0)) {
|
||||
#if VERSION != VERSION_SHIELD_DEBUG
|
||||
play->getEvent().reset();
|
||||
#else
|
||||
dComIfGp_event_reset();
|
||||
#endif
|
||||
field_0x9fe = 0;
|
||||
}
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user