diff options
| author | hatal175 <hatal175@users.noreply.github.com> | 2024-08-10 06:23:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-09 20:23:17 -0700 |
| commit | 7894ea5140a30c8241efe465a0442eab6b789984 (patch) | |
| tree | 55f7b3ac9a84f146a72addb4fdd037f5159124b5 /include/d/msg/d_msg_object.h | |
| parent | e7e5453771e88272aaa55de7f20db50bf68c6b54 (diff) | |
Work on d_msg_scrn_item (#2188)
Diffstat (limited to 'include/d/msg/d_msg_object.h')
| -rw-r--r-- | include/d/msg/d_msg_object.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h index 2fc8016011..3651f0e210 100644 --- a/include/d/msg/d_msg_object.h +++ b/include/d/msg/d_msg_object.h @@ -119,7 +119,7 @@ public: char*, char*, char*, s16*); /* 80238174 */ static void* getMsgDtPtr(); /* 80238188 */ static void setProcessID(unsigned int); - /* 8023819C */ static fopAc_ac_c* getActor(); + /* 8023819C */ static msg_class* getActor(); /* 802381C0 */ static fopAc_ac_c* getpTalkActor(); /* 802381D4 */ static int getIdx(); /* 802381E8 */ static u16 getNodeIdx(); @@ -222,8 +222,7 @@ public: u8 getBombNumLocal(int idx) { return mBombNum[idx]; } bool isCameraCancelFlagLocal() { return mCameraCancelFlag; } void* getMsgDtPtrLocal() { return mpMsgDt; } - // TODO: The type return is unclear. Maybe msg_class*. - fopAc_ac_c* getActorLocal() { return (fopAc_ac_c*)field_0x100; } + msg_class* getActorLocal() { return field_0x100; } fopAc_ac_c* getpTalkActorLocal() { return mpTalkActor; } int getIdxLocal() { return mIdx; } u16 getNodeIdxLocal() { return mNodeIdx; } @@ -677,4 +676,8 @@ public: /* 0x35C */ dMsgObject_HowlHIO_c mHowlHIO; }; +#ifndef DISABLE_MSG_OBJECT_EXTERN +extern dMsgObject_HIO_c g_MsgObject_HIO_c; +#endif + #endif /* D_MSG_D_MSG_OBJECT_H */ |