From 208c617e2695ec568a31cf0c448492aaec69f96b Mon Sep 17 00:00:00 2001 From: avitasia Date: Fri, 6 Mar 2026 08:18:13 -0800 Subject: [PATCH] fix regular raid messages not looking at NP_ChatBubblesRaid cvar --- nampower.map | 6 +++--- nampower/chat.cpp | 1 + nampower/main.hpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nampower.map b/nampower.map index ae3acc4..d8dc7d9 100644 --- a/nampower.map +++ b/nampower.map @@ -1,6 +1,6 @@ nampower - Timestamp is 69aa0c43 (Thu Mar 5 15:05:39 2026) + Timestamp is 69aafe26 (Fri Mar 6 08:17:42 2026) Preferred load address is 10000000 @@ -8470,8 +8470,8 @@ 0001:0004d409 __catch$?put@?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV12@D@Z$0 1004e409 f i main.cpp.obj 0001:0004f3c0 __catch$_Load$0 100503c0 f main.cpp.obj 0001:0004f45f __catch$_Load$1 1005045f f main.cpp.obj - 0001:0004f8f4 $LN29 100508f4 chat.cpp.obj - 0001:0004f90c $LN28 1005090c chat.cpp.obj + 0001:0004f8f4 $LN30 100508f4 chat.cpp.obj + 0001:0004f90c $LN29 1005090c chat.cpp.obj 0001:0004fa10 ??$_Find_last@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@?$_Hash@V?$_Umap_traits@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UCachedEntry@?1??GetSpellSlotAndTypeForName@Nampower@@YAHPBDPAI@Z@V?$_Uhash_compare@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UCachedEntry@?1??GetSpellSlotAndTypeForName@Nampower@@YAHPBDPAI@Z@@std@@@2@$0A@@std@@@std@@IBE?AU?$_Hash_find_last_result@PAU?$_List_node@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UCachedEntry@?1??GetSpellSlotAndTypeForName@Nampower@@YAHPBDPAI@Z@@std@@PAX@std@@@1@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@I@Z 10050a10 f helper.cpp.obj 0001:0004fb70 ??$_Try_emplace@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@$$V@?$_Hash@V?$_Umap_traits@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UCachedEntry@?1??GetSpellSlotAndTypeForName@Nampower@@YAHPBDPAI@Z@V?$_Uhash_compare@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UCachedEntry@?1??GetSpellSlotAndTypeForName@Nampower@@YAHPBDPAI@Z@@std@@@2@$0A@@std@@@std@@IAE?AU?$pair@PAU?$_List_node@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UCachedEntry@?1??GetSpellSlotAndTypeForName@Nampower@@YAHPBDPAI@Z@@std@@PAX@std@@_N@1@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z 10050b70 f helper.cpp.obj 0001:0004ff80 ??$fill@PAV?$_List_unchecked_iterator@V?$_List_val@U?$_List_simple_types@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UCachedEntry@?1??GetSpellSlotAndTypeForName@Nampower@@YAHPBDPAI@Z@@std@@@std@@@std@@@std@@V12@@std@@YAXQAV?$_List_unchecked_iterator@V?$_List_val@U?$_List_simple_types@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UCachedEntry@?1??GetSpellSlotAndTypeForName@Nampower@@YAHPBDPAI@Z@@std@@@std@@@std@@@0@0ABV10@@Z 10050f80 f helper.cpp.obj diff --git a/nampower/chat.cpp b/nampower/chat.cpp index 6621889..cc12d39 100644 --- a/nampower/chat.cpp +++ b/nampower/chat.cpp @@ -104,6 +104,7 @@ namespace Nampower { case game::CHAT_CMD_WHISPER_INFORM: bubbleEnabledCvar = "NP_ChatBubblesWhisper"; break; + case game::CHAT_CMD_RAID: case game::CHAT_CMD_RAID_LEADER: case game::CHAT_CMD_RAID_WARNING: bubbleEnabledCvar = "NP_ChatBubblesRaid"; diff --git a/nampower/main.hpp b/nampower/main.hpp index 3dfb6b9..6085b03 100644 --- a/nampower/main.hpp +++ b/nampower/main.hpp @@ -27,7 +27,7 @@ namespace Nampower { constexpr uint32_t MAJOR_VERSION = 3; constexpr uint32_t MINOR_VERSION = 3; - constexpr uint32_t PATCH_VERSION = 0; + constexpr uint32_t PATCH_VERSION = 1; constexpr int32_t LUA_REGISTRYINDEX = -10000; constexpr int32_t LUA_GLOBALSINDEX = -10001;