From 637419b21d16f02a11f3cd4b7b35634dc8f23f19 Mon Sep 17 00:00:00 2001 From: robojumper Date: Sat, 13 Sep 2025 11:51:16 +0200 Subject: [PATCH] msgIdx --- include/d/lyt/msg_window/d_lyt_msg_window.h | 6 +++--- src/d/d_tag_processor.cpp | 4 ++-- src/d/lyt/msg_window/d_lyt_msg_window.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/d/lyt/msg_window/d_lyt_msg_window.h b/include/d/lyt/msg_window/d_lyt_msg_window.h index 069c4889..ab6cc7af 100644 --- a/include/d/lyt/msg_window/d_lyt_msg_window.h +++ b/include/d/lyt/msg_window/d_lyt_msg_window.h @@ -93,8 +93,8 @@ public: return mpTagProcessor; } - s32 getField_0x784() const { - return field_0x784; + s32 getMsgIdx() const { + return mMsgIdx; } u8 getField_0x80D() const { @@ -166,7 +166,7 @@ private: /* 0x778 */ s32 field_0x778; /* 0x77C */ s32 field_0x77C; /* 0x780 */ s32 field_0x780; - /* 0x784 */ s32 field_0x784; + /* 0x784 */ s32 mMsgIdx; /* 0x788 */ u16 mEntryPointToTrigger; /* 0x78A */ u16 mAlsoEntryPointToTrigger; diff --git a/src/d/d_tag_processor.cpp b/src/d/d_tag_processor.cpp index 17510bbe..5c76e740 100644 --- a/src/d/d_tag_processor.cpp +++ b/src/d/d_tag_processor.cpp @@ -1572,12 +1572,12 @@ void dTagProcessor_c::somethingWithScrapperAndMusic(wchar_t *src) { if ((ac->profile_name >= fProfile::NPC_SLFB && ac->profile_name <= fProfile::NPC_SLFL) || (ac->profile_name >= fProfile::NPC_SLB && ac->profile_name <= fProfile::FLY_SLB) || ac->profile_name == fProfile::NPC_SLB2 || ac->profile_name == fProfile::NPC_DRBC) { - dSndPlayerMgr_c::GetInstance()->setMsgActor(dLytMsgWindow_c::getInstance()->getField_0x784(), ac); + dSndPlayerMgr_c::GetInstance()->setMsgActor(dLytMsgWindow_c::getInstance()->getMsgIdx(), ac); return; } } } else if (field_0x824 == 101) { - dSndPlayerMgr_c::GetInstance()->setMsgActor(dLytMsgWindow_c::getInstance()->getField_0x784(), nullptr); + dSndPlayerMgr_c::GetInstance()->setMsgActor(dLytMsgWindow_c::getInstance()->getMsgIdx(), nullptr); } } diff --git a/src/d/lyt/msg_window/d_lyt_msg_window.cpp b/src/d/lyt/msg_window/d_lyt_msg_window.cpp index 636761d6..d43b29d9 100644 --- a/src/d/lyt/msg_window/d_lyt_msg_window.cpp +++ b/src/d/lyt/msg_window/d_lyt_msg_window.cpp @@ -120,7 +120,7 @@ bool dLytMsgWindow_c::build() { field_0x778 = 0; field_0x77C = 0; field_0x780 = 0; - field_0x784 = -1; + mMsgIdx = -1; mAlsoEntryPointToTrigger = 0xFFFF; mEntryPointToTrigger = 0xFFFF;