mirror of
https://github.com/mangosfour/server.git
synced 2025-12-27 01:37:04 +00:00
[11465] non-ObjectGuid guids in random places.
Only ChannelMgr code wide use uint64 guids now, and Map object stores.
This commit is contained in:
parent
a925db80fa
commit
ef6a48fe03
44 changed files with 219 additions and 215 deletions
|
|
@ -149,10 +149,10 @@ bool PlayerMenu::GossipOptionCoded( unsigned int Selection )
|
|||
return mGossipMenu.MenuItemCoded( Selection );
|
||||
}
|
||||
|
||||
void PlayerMenu::SendGossipMenu(uint32 TitleTextId, uint64 objectGUID)
|
||||
void PlayerMenu::SendGossipMenu(uint32 TitleTextId, ObjectGuid objectGuid)
|
||||
{
|
||||
WorldPacket data(SMSG_GOSSIP_MESSAGE, (100)); // guess size
|
||||
data << uint64(objectGUID);
|
||||
data << ObjectGuid(objectGuid);
|
||||
data << uint32(mGossipMenu.GetMenuId()); // new 2.4.0
|
||||
data << uint32(TitleTextId);
|
||||
data << uint32(mGossipMenu.MenuItemCount()); // max count 0x20
|
||||
|
|
@ -160,17 +160,17 @@ void PlayerMenu::SendGossipMenu(uint32 TitleTextId, uint64 objectGUID)
|
|||
for (uint32 iI = 0; iI < mGossipMenu.MenuItemCount(); ++iI )
|
||||
{
|
||||
GossipMenuItem const& gItem = mGossipMenu.GetItem(iI);
|
||||
data << uint32( iI );
|
||||
data << uint8( gItem.m_gIcon );
|
||||
data << uint8( gItem.m_gCoded ); // makes pop up box password
|
||||
data << uint32(iI);
|
||||
data << uint8(gItem.m_gIcon);
|
||||
data << uint8(gItem.m_gCoded); // makes pop up box password
|
||||
data << uint32(gItem.m_gBoxMoney); // money required to open menu, 2.0.3
|
||||
data << gItem.m_gMessage; // text for gossip item, max 0x800
|
||||
data << gItem.m_gBoxMessage; // accept text (related to money) pop up box, 2.0.3, max 0x800
|
||||
}
|
||||
|
||||
data << uint32( mQuestMenu.MenuItemCount() ); // max count 0x20
|
||||
data << uint32(mQuestMenu.MenuItemCount()); // max count 0x20
|
||||
|
||||
for (uint32 iI = 0; iI < mQuestMenu.MenuItemCount(); ++iI )
|
||||
for (uint32 iI = 0; iI < mQuestMenu.MenuItemCount(); ++iI)
|
||||
{
|
||||
QuestMenuItem const& qItem = mQuestMenu.GetItem(iI);
|
||||
uint32 questID = qItem.m_qId;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue