Entities/Gossip: The Big One™ that gets rid of all uses of The Bad™ and The Ugly™, e.g. gossip preprocessor macros, and replaces them with the new-and-shiny gossip functions.

(cherry picked from commit d55426f5b4e431e6d398b1e2dbbd25f7387328f2)
2017-02-18 17:50:00 +01:00
parent f94dc007ae
commit bbbf8df8e5
55 changed files with 554 additions and 577 deletions
@@ -2147,9 +2147,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                    if (e.action.sendGossipMenu.gossipMenuId)
                        player->PrepareGossipMenu(GetBaseObject(), e.action.sendGossipMenu.gossipMenuId, true);
                    else
-                        player->PlayerTalkClass->ClearMenus();
+                        ClearGossipMenuFor(player);

-                    player->SEND_GOSSIP_MENU(e.action.sendGossipMenu.gossipNpcTextId, GetBaseObject()->GetGUID());
+                    SendGossipMenuFor(player, e.action.sendGossipMenu.gossipNpcTextId, GetBaseObject()->GetGUID());
                }
            }