From d12cf18ce1707aeadef5fecac7c9a7961f623810 Mon Sep 17 00:00:00 2001 From: gymnast86 Date: Wed, 22 Jul 2026 04:23:07 -0700 Subject: [PATCH] change name of default entry --- include/d/d_msg_class.h | 2 +- src/d/d_msg_class.cpp | 4 ++-- src/dusk/randomizer/game/messages.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/d/d_msg_class.h b/include/d/d_msg_class.h index e61dfe9ac5..a0772dce9f 100644 --- a/include/d/d_msg_class.h +++ b/include/d/d_msg_class.h @@ -43,7 +43,7 @@ public: #if TARGET_PC // Default attributes for custom text ids -static JMSMesgEntry_c defaultEntry{ +static JMSMesgEntry_c defaultJMSMesgEntry{ .string_offset = 0, .message_id = 0, .event_label_id = 0, diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp index 11b39c3aae..be0f7bea0b 100644 --- a/src/d/d_msg_class.cpp +++ b/src/d/d_msg_class.cpp @@ -72,8 +72,8 @@ JMSMesgEntry_c& JMSMesgInfo_c::getEntry(u16 index) { } // If we didn't specify attributes for the custom index, use the default - defaultEntry.message_id = index; - return defaultEntry; + defaultJMSMesgEntry.message_id = index; + return defaultJMSMesgEntry; } #endif diff --git a/src/dusk/randomizer/game/messages.cpp b/src/dusk/randomizer/game/messages.cpp index e035162f84..012e695df5 100644 --- a/src/dusk/randomizer/game/messages.cpp +++ b/src/dusk/randomizer/game/messages.cpp @@ -93,8 +93,8 @@ bool HandleCustomText(JMessage::TControl* control, u16 msgId) { control->pEntry_ = reinterpret_cast(&attributeOverrides[key]); // Otherwise, use the default entry } else { - defaultEntry.message_id = msgId; - control->pEntry_ = &defaultEntry; + defaultJMSMesgEntry.message_id = msgId; + control->pEntry_ = &defaultJMSMesgEntry; } return true; }