Fix impal

Author: hev7

include/d/actor/d_a_npc_ash.h

@@ -39,7 +39,6 @@ class daNpcAsh_HIO_c : public mDoHIO_entry_c {
  */
 class daNpcAsh_c : public daNpcF_c {
 public:
-    typedef bool (daNpcAsh_c::*ActionFn)(void*);
     typedef BOOL (daNpcAsh_c::*EventFn)(int);
 
     enum Type {
@@ -107,7 +106,7 @@ class daNpcAsh_c : public daNpcF_c {
     /* 809596E0 */ bool setExpressionBtp(int);
     /* 809597C0 */ void setMotionAnm(int i_idx, f32 i_morf);
     /* 80959910 */ void reset();
-    /* 80959B28 */ inline bool setAction(ActionFn);
+    /* 80959B28 */ inline bool setAction(bool (daNpcAsh_c::*)(void*));
     /* 80959BD0 */ inline bool isSneaking();
     /* 80959C40 */ bool wait_type0(void*);
     /* 8095A67C */ void setMotion(int, f32, int);
@@ -154,7 +153,7 @@ class daNpcAsh_c : public daNpcF_c {
     /* 0xCB0 */ fopAc_ac_c* mTalkPartner;
     /* 0xCB4 */ NPC_ASH_HIO_CLASS* mpHIO;
     /* 0xCB8 */ dCcD_Cyl mCcCyl[2];
-    /* 0xF30 */ ActionFn mpActionFn;
+    /* 0xF30 */ bool (daNpcAsh_c::*mAction)(void*);
     /* 0xF3C */ request_of_phase_process_class mPhase[2];
     /* 0xF4C */ u32 mItemPartnerId;
     /* 0xF50 */ u32 field_0xf50;  // unused

src/d/actor/d_a_npc_ash.cpp

@@ -594,7 +594,7 @@ void daNpcAsh_c::reset() {
 
     field_0xf50 = 0;
     field_0xf54 = 0;
-    mpActionFn = NULL;
+    mAction = NULL;
     mLookMode = -1;
     mMode = 0;
     gravity = mpHIO->m.common.gravity;
@@ -623,23 +623,23 @@ void daNpcAsh_c::reset() {
     }
 
     if (mType == TYPE_BAR) {
-        setAction(&wait_type0);
+        setAction(&daNpcAsh_c::wait_type0);
     } else {
-        setAction(&wait_type1);
+        setAction(&daNpcAsh_c::wait_type1);
     }
 }
 
 /* 80959B28-80959BD0 001928 00A8+00 1/1 0/0 0/0 .text
  * setAction__10daNpcAsh_cFM10daNpcAsh_cFPCvPvPv_b              */
-bool daNpcAsh_c::setAction(daNpcAsh_c::ActionFn i_actionFn) {
+bool daNpcAsh_c::setAction(bool (daNpcAsh_c::*i_action)(void*)) {
     mMode = 3;
-    if (mpActionFn != NULL) {
-        (this->*mpActionFn)(NULL);
+    if (mAction != NULL) {
+        (this->*mAction)(NULL);
     }
     mMode = 0;
-    this->mpActionFn = i_actionFn;
-    if (mpActionFn != NULL) {
-        (this->*mpActionFn)(NULL);
+    mAction = i_action;
+    if (mAction != NULL) {
+        (this->*mAction)(NULL);
     }
     return true;
 }
@@ -845,12 +845,12 @@ bool daNpcAsh_c::wait_type0(void* param_0) {
                         mOrderEvtNo = 3;
                         changeEvent(l_arcNames[0], l_evtNames[mOrderEvtNo], 1, -1);
                     } else {
-                        setAction(&talk);
+                        setAction(&daNpcAsh_c::talk);
                     }
                 }
             } else {
                 if (dComIfGp_getEventManager().getMyStaffId(l_myName, NULL, 0) != -1) {
-                    setAction(&demo);
+                    setAction(&daNpcAsh_c::demo);
                 }
             }
         } else {
@@ -918,7 +918,7 @@ bool daNpcAsh_c::wait_type1(void* param_0) {
 
         case 1:
             if (daNpcF_chkTmpBit(0x74)) {
-                setAction(&leave);
+                setAction(&daNpcAsh_c::leave);
             }
             break;
         }
@@ -955,7 +955,7 @@ bool daNpcAsh_c::talk(void* param_0) {
         if (field_0xf5f <= 2 || mCurAngle.y == fopAcM_searchPlayerAngleY(this)) {
             if (talkProc(NULL, 1, NULL)) {
                 mActorMngr[0].entry(daPy_getPlayerActorClass());
-                setAction(&wait_type0);
+                setAction(&daNpcAsh_c::wait_type0);
                 ret = true;
             } else {
                 s32 prev_msg_timer = mMsgTimer;
@@ -1024,18 +1024,18 @@ bool daNpcAsh_c::demo(void* param_0) {
                 mOrderEvtNo = 0;
                 mEventIdx = -1;
                 if (mType == TYPE_BAR) {
-                    setAction(&wait_type0);
+                    setAction(&daNpcAsh_c::wait_type0);
                 } else {
-                    setAction(&wait_type1);
+                    setAction(&daNpcAsh_c::wait_type1);
                 }
             }
         } else {
             mOrderEvtNo = 0;
             mEventIdx = -1;
             if (mType == TYPE_BAR) {
-                setAction(&wait_type0);
+                setAction(&daNpcAsh_c::wait_type0);
             } else {
-                setAction(&wait_type1);
+                setAction(&daNpcAsh_c::wait_type1);
             }
         }
         break;
@@ -1293,8 +1293,8 @@ void daNpcAsh_c::setParam() {
 
 /* 8095BF6C-8095C200 003D6C 0294+00 1/0 0/0 0/0 .text            main__10daNpcAsh_cFv */
 BOOL daNpcAsh_c::main() {
-    if (mpActionFn != NULL) {
-        (this->*mpActionFn)(NULL);
+    if (mAction != NULL) {
+        (this->*mAction)(NULL);
     }
     if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk() && mItemPartnerId != -1) {
         dComIfGp_event_setItemPartnerId(mItemPartnerId);

src/d/actor/d_a_npc_impal.cpp

@@ -50,10 +50,6 @@ daNpcImpal_HIO_c::daNpcImpal_HIO_c() {
     m = daNpcImpal_Param_c::m;
 }
 
-void daNpcImpal_HIO_c::listenPropertyEvent(const JORPropertyEvent* event) {
-    // TODO
-}
-
 void daNpcImpal_HIO_c::genMessage(JORMContext* ctext) {
     // TODO
 }