diff options
Diffstat (limited to 'src/game/GossipDef.cpp')
| -rw-r--r-- | src/game/GossipDef.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/game/GossipDef.cpp b/src/game/GossipDef.cpp index b2fdec67688..b68c8b17f00 100644 --- a/src/game/GossipDef.cpp +++ b/src/game/GossipDef.cpp @@ -196,10 +196,7 @@ void PlayerMenu::SendPointOfInterest( float X, float Y, uint32 Icon, uint32 Flag void PlayerMenu::SendTalking( uint32 textID ) { - GossipText *pGossip; - std::string GossipStr; - - pGossip = objmgr.GetGossipText(textID); + GossipText const* pGossip = objmgr.GetGossipText(textID); WorldPacket data( SMSG_NPC_TEXT_UPDATE, 100 ); // guess size data << textID; // can be < 0 @@ -259,14 +256,11 @@ void PlayerMenu::SendTalking( uint32 textID ) data << pGossip->Options[i].Language; - data << pGossip->Options[i].Emotes[0]._Delay; - data << pGossip->Options[i].Emotes[0]._Emote; - - data << pGossip->Options[i].Emotes[1]._Delay; - data << pGossip->Options[i].Emotes[1]._Emote; - - data << pGossip->Options[i].Emotes[2]._Delay; - data << pGossip->Options[i].Emotes[2]._Emote; + for(int j = 0; j < 3; ++j) + { + data << pGossip->Options[i].Emotes[j]._Delay; + data << pGossip->Options[i].Emotes[j]._Emote; + } } } pSession->SendPacket( &data ); |