Merge branch 'master' into 308

This commit is contained in:
tomrus88 2009-01-21 10:59:27 +03:00
commit 8ffa79211b
129 changed files with 3156 additions and 1666 deletions

View file

@ -125,7 +125,7 @@ bool PlayerMenu::GossipOptionCoded( unsigned int Selection )
void PlayerMenu::SendGossipMenu( uint32 TitleTextId, uint64 npcGUID )
{
WorldPacket data( SMSG_GOSSIP_MESSAGE, (100) ); // guess size
data << npcGUID;
data << uint64(npcGUID);
data << uint32(0); // new 2.4.0
data << uint32( TitleTextId );
data << uint32( mGossipMenu.MenuItemCount() ); // max count 0x0F