From dc7e945aedef44eb7be76a61c2da37e238560c3e Mon Sep 17 00:00:00 2001 From: soruh Date: Sat, 22 Mar 2025 00:20:51 +0100 Subject: [PATCH] Implement `onCondition` inline function of `dEvt_info_c` --- include/f_op/f_op_actor.h | 2 +- src/d/actor/d_a_e_po.cpp | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 3cfdce5ff1d..c8aea71ed6a 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -123,12 +123,12 @@ public: void setEventName(char*); char* getEventName(); void beforeProc(); - void onCondition(u16); void offCondition(u16); BOOL checkCommandCatch(); BOOL checkCommandDoor(); BOOL checkCommandDemoAccrpt() { return mCommand == dEvtCmd_INDEMO_e; } + void onCondition(u16 condition) { mCondition |= condition; } void setCommand(u16 command) { mCommand = command; } void setMapToolId(u8 id) { mMapToolId = id; } void setEventId(s16 id) { mEventId = id; } diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index 618ae09dcad..45429c46b1b 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -89,7 +89,6 @@ extern "C" static void daPy_getPlayerActorClass__Fv(); extern "C" void Fovy__9dCamera_cFv(); extern "C" void __as__4cXyzFRC4cXyz(); extern "C" static void fopAcM_searchPlayerAngleY__FPC10fopAc_ac_c(); -extern "C" void onCondition__11dEvt_info_cFUs(); extern "C" void checkCommandDemoAccrpt__11dEvt_info_cFv(); extern "C" void __ct__4cXyzFRC4cXyz(); extern "C" void __ct__4cXyzFfff(); @@ -3036,11 +3035,6 @@ extern "C" void fopAcM_searchPlayerAngleY__FPC10fopAc_ac_c() { // NONMATCHING } -/* 8075764C-8075765C 00B1EC 0010+00 1/1 0/0 0/0 .text onCondition__11dEvt_info_cFUs */ -void dEvt_info_c::onCondition(u16 param_0) { - // NONMATCHING -} - /* 8075765C-80757670 00B1FC 0014+00 1/1 0/0 0/0 .text checkCommandDemoAccrpt__11dEvt_info_cFv */ // void dEvt_info_c::checkCommandDemoAccrpt() { extern "C" void checkCommandDemoAccrpt__11dEvt_info_cFv() {