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

[9270] Send pointOfInterest (if exist) to client before sending gossip menu.

Browse source 
Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
NoFantasy 2010-01-30 15:10:00 +01:00
parent a1a0c6edbe
commit bfa86a0d4d
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/Player.cpp
View file

@ -12468,15 +12468,15 @@ void Player::OnGossipSelect(WorldObject* pSource, uint32 gossipListId, uint32 me
{ {
case GOSSIP_OPTION_GOSSIP: case GOSSIP_OPTION_GOSSIP:
{ {
if (pMenuData.m_gAction_poi)
PlayerTalkClass->SendPointOfInterest(pMenuData.m_gAction_poi);
if (pMenuData.m_gAction_menu) if (pMenuData.m_gAction_menu)
{ {
PrepareGossipMenu(pSource, pMenuData.m_gAction_menu); PrepareGossipMenu(pSource, pMenuData.m_gAction_menu);
SendPreparedGossip(pSource); SendPreparedGossip(pSource);
} }
if (pMenuData.m_gAction_poi)
PlayerTalkClass->SendPointOfInterest(pMenuData.m_gAction_poi);
if (pMenuData.m_gAction_script) if (pMenuData.m_gAction_script)
{ {
if (pSource->GetTypeId() == TYPEID_GAMEOBJECT) if (pSource->GetTypeId() == TYPEID_GAMEOBJECT)

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9269" #define REVISION_NR "9270"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__