mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 04:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10901] Allow vehicles to have gossip menu

Browse source 
In addition rename IsGameobject -> IsGameObject.
This commit is contained in:
zergtmn 2010-12-21 15:11:41 +05:00
parent d736fe9d9a
commit 2f4e7a9377
8 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/game/NPCHandler.cpp
View file

@ -330,7 +330,7 @@ void WorldSession::HandleGossipSelectOptionOpcode( WorldPacket & recv_data )
uint32 gossipListId;
uint32 menuId;
ObjectGuid guid;
std::string code = "";
std::string code;
recv_data >> guid >> menuId >> gossipListId;
@ -344,8 +344,7 @@ void WorldSession::HandleGossipSelectOptionOpcode( WorldPacket & recv_data )
if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
// can vehicle have gossip? If so, need check for this also.
if (guid.IsCreatureOrPet())
if (guid.IsAnyTypeCreature())
{
Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_NONE);
@ -366,7 +365,7 @@ void WorldSession::HandleGossipSelectOptionOpcode( WorldPacket & recv_data )
_player->OnGossipSelect(pCreature, gossipListId, menuId);
}
}
else if (guid.IsGameobject())
else if (guid.IsGameObject())
{
GameObject *pGo = GetPlayer()->GetGameObjectIfCanInteractWith(guid);