[7285] More code cleanups in static data structures use.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
zhenya 2009-02-16 17:09:19 +03:00 committed by VladimirMangos
parent b30d1e65a0
commit 8dc3586889
11 changed files with 50 additions and 89 deletions

View file

@ -194,10 +194,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
@ -257,14 +254,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 );