From 9e668373ed4804844ecc5919e0232bd5f6faf6b8 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Wed, 10 Nov 2010 04:37:24 +0300 Subject: [PATCH] [10714] Avoid unexpected error at action_menu_id < 0 after recent loading checks adding. --- src/game/ObjectMgr.cpp | 2 +- src/shared/revision_nr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index ad153ef1e96..6ad5ac362ff 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -9273,7 +9273,7 @@ void ObjectMgr::LoadGossipMenuItems() continue; } - if (gMenuItem.action_menu_id) + if (gMenuItem.action_menu_id > 0) { if (m_mGossipMenusMap.find(gMenuItem.action_menu_id) == m_mGossipMenusMap.end()) sLog.outErrorDb("Gossip menu option (MenuId: %u Id: %u) have action_menu_id = %u for nonexistent menu", gMenuItem.menu_id, gMenuItem.id, gMenuItem.action_menu_id); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 9ed6df74737..15ed44e003d 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 "10713" + #define REVISION_NR "10714" #endif // __REVISION_NR_H__