From cac834d67f61d5ae347a988863bb4c732d924590 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Wed, 1 Nov 2023 01:14:16 -0400 Subject: [PATCH] fix daPy_npc_c::setRestart regression --- include/f_op/f_op_actor.h | 10 +++++----- src/d/actor/d_a_obj_mknjd.cpp | 4 ++-- src/d/actor/d_a_player_npc.cpp | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index a7b63042f..1b5b627c8 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -146,11 +146,11 @@ public: void onCondition(u16 cond) { mCondition |= cond; } void offCondition(u16 cond) { mCondition &= ~cond; } - bool checkCommandTalk() { return mCommand == dEvtCmd_INTALK_e; } - bool checkCommandItem() { return mCommand == dEvtCmd_INGETITEM_e; } - bool checkCommandDoor() { return mCommand == dEvtCmd_INDOOR_e; } - bool checkCommandDemoAccrpt() { return mCommand == dEvtCmd_INDEMO_e; } - bool checkCommandCatch() { return mCommand == dEvtCmd_INCATCH_e; } + BOOL checkCommandTalk() { return mCommand == dEvtCmd_INTALK_e; } + BOOL checkCommandItem() { return mCommand == dEvtCmd_INGETITEM_e; } + BOOL checkCommandDoor() { return mCommand == dEvtCmd_INDOOR_e; } + BOOL checkCommandDemoAccrpt() { return mCommand == dEvtCmd_INDEMO_e; } + BOOL checkCommandCatch() { return mCommand == dEvtCmd_INCATCH_e; } /* 0x04 */ u16 mCommand; /* 0x06 */ u16 mCondition; diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp index 23f894362..75aeae231 100644 --- a/src/d/actor/d_a_obj_mknjd.cpp +++ b/src/d/actor/d_a_obj_mknjd.cpp @@ -817,7 +817,7 @@ int daObjMknjD::Act_c::Execute(Mtx** i_mtx) { case 0: mEvtInfo.onCondition(1); - if (mEvtInfo.checkCommandTalk() == true) { + if (mEvtInfo.checkCommandTalk()) { m0500 = 1; m043F = 0x0B; } @@ -943,7 +943,7 @@ int daObjMknjD::Act_c::Execute(Mtx** i_mtx) { mEvtInfo.onCondition(1); mEvtInfo.onCondition(32); - if (mEvtInfo.checkCommandTalk() == true) { + if (mEvtInfo.checkCommandTalk()) { if (dComIfGp_event_chkTalkXY()) { m0500 = 0; m043F = 9; diff --git a/src/d/actor/d_a_player_npc.cpp b/src/d/actor/d_a_player_npc.cpp index a89a50197..0daf45e82 100644 --- a/src/d/actor/d_a_player_npc.cpp +++ b/src/d/actor/d_a_player_npc.cpp @@ -50,7 +50,6 @@ BOOL daPy_npc_c::check_moveStop() { /* 8015A524-8015A590 .text setRestart__10daPy_npc_cFSc */ void daPy_npc_c::setRestart(s8 option) { - /* Nonmatching (this matched at some point, what broke it?) */ if (option == dComIfGs_getRestartOption()) { bool playerInDoor = dComIfGp_getPlayer(0)->mEvtInfo.checkCommandDoor(); s8 roomNo = current.roomNo;