Update Eluna module and adjust Gossip function name to match

billy1arm · billy1arm · commit 9d5dd2cc3db9 · 2025-03-13T22:58:55.000Z
diff --git a/src/game/Object/Player.cpp b/src/game/Object/Player.cpp
@@ -14516,7 +14516,7 @@ void Player::PrepareGossipMenu(WorldObject* pSource, uint32 menuId)
             }
 
             pMenu->GetGossipMenu().AddMenuItem(gossipMenu.option_icon, strOptionText, 0, gossipMenu.option_id, strBoxText, gossipMenu.box_money, gossipMenu.box_coded);
-            pMenu->GetGossipMenu().AddGossipMenuItemData(gossipMenu.action_menu_id, gossipMenu.action_poi_id, gossipMenu.action_script_id);
+            pMenu->GetGossipMenu().AddMenuItemData(gossipMenu.action_menu_id, gossipMenu.action_poi_id, gossipMenu.action_script_id);
         }
     }
 
diff --git a/src/game/WorldHandlers/GossipDef.cpp b/src/game/WorldHandlers/GossipDef.cpp
@@ -61,7 +61,7 @@ void GossipMenu::AddMenuItem(uint8 Icon, const std::string& Message, uint32 dtSe
 }
 
 // Adds gossip menu item data
-void GossipMenu::AddGossipMenuItemData(int32 action_menu, uint32 action_poi, uint32 action_script)
+void GossipMenu::AddMenuItemData(int32 action_menu, uint32 action_poi, uint32 action_script)
 {
     GossipMenuItemData pItemData{};
 
diff --git a/src/game/WorldHandlers/GossipDef.h b/src/game/WorldHandlers/GossipDef.h
@@ -198,7 +198,7 @@ class GossipMenu
         void SetMenuId(uint32 menu_id) { m_gMenuId = menu_id; }
         uint32 GetMenuId() const { return m_gMenuId; }
 
-        void AddGossipMenuItemData(int32 action_menu, uint32 action_poi, uint32 action_script);
+        void AddMenuItemData(int32 action_menu, uint32 action_poi, uint32 action_script);
 
         unsigned int MenuItemCount() const
         {
diff --git a/src/modules/Eluna b/src/modules/Eluna
@@ -1 +1 @@
-Subproject commit f65449069717db04ca795f868a7e9c411183e755
+Subproject commit 6aa13f08ab58ceae8d084a6bc528bad60dac6d48

Original file line number	Diff line number	Diff line change
`@@ -14516,7 +14516,7 @@ void Player::PrepareGossipMenu(WorldObject* pSource, uint32 menuId)`
`14516`	`14516`	`}`
`14517`	`14517`
`14518`	`14518`	`pMenu->GetGossipMenu().AddMenuItem(gossipMenu.option_icon, strOptionText, 0, gossipMenu.option_id, strBoxText, gossipMenu.box_money, gossipMenu.box_coded);`
`14519`		`- pMenu->GetGossipMenu().AddGossipMenuItemData(gossipMenu.action_menu_id, gossipMenu.action_poi_id, gossipMenu.action_script_id);`
	`14519`	`+ pMenu->GetGossipMenu().AddMenuItemData(gossipMenu.action_menu_id, gossipMenu.action_poi_id, gossipMenu.action_script_id);`
`14520`	`14520`	`}`
`14521`	`14521`	`}`
`14522`	`14522`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ void GossipMenu::AddMenuItem(uint8 Icon, const std::string& Message, uint32 dtSe`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`// Adds gossip menu item data`
`64`		`-void GossipMenu::AddGossipMenuItemData(int32 action_menu, uint32 action_poi, uint32 action_script)`
	`64`	`+void GossipMenu::AddMenuItemData(int32 action_menu, uint32 action_poi, uint32 action_script)`
`65`	`65`	`{`
`66`	`66`	`GossipMenuItemData pItemData{};`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ class GossipMenu`
`198`	`198`	`void SetMenuId(uint32 menu_id) { m_gMenuId = menu_id; }`
`199`	`199`	`uint32 GetMenuId() const { return m_gMenuId; }`
`200`	`200`
`201`		`- void AddGossipMenuItemData(int32 action_menu, uint32 action_poi, uint32 action_script);`
	`201`	`+ void AddMenuItemData(int32 action_menu, uint32 action_poi, uint32 action_script);`
`202`	`202`
`203`	`203`	`unsigned int MenuItemCount() const`
`204`	`204`	`{`