From bfa86a0d4d24ed6f1bbad9fb3d5ebfa963e0b618 Mon Sep 17 00:00:00 2001 From: NoFantasy Date: Sat, 30 Jan 2010 15:10:00 +0100 Subject: [PATCH] [9270] Send pointOfInterest (if exist) to client before sending gossip menu. Signed-off-by: NoFantasy --- src/game/Player.cpp | 6 +++--- src/shared/revision_nr.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 15f3f074a..f8fbbd76a 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -12468,15 +12468,15 @@ void Player::OnGossipSelect(WorldObject* pSource, uint32 gossipListId, uint32 me { case GOSSIP_OPTION_GOSSIP: { + if (pMenuData.m_gAction_poi) + PlayerTalkClass->SendPointOfInterest(pMenuData.m_gAction_poi); + if (pMenuData.m_gAction_menu) { PrepareGossipMenu(pSource, pMenuData.m_gAction_menu); SendPreparedGossip(pSource); } - if (pMenuData.m_gAction_poi) - PlayerTalkClass->SendPointOfInterest(pMenuData.m_gAction_poi); - if (pMenuData.m_gAction_script) { if (pSource->GetTypeId() == TYPEID_GAMEOBJECT) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 1c45871d0..caae78f7f 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9269" + #define REVISION_NR "9270" #endif // __REVISION_NR_H__