From d3b19f8aa464c16ed766744126d95d3dd72efe14 Mon Sep 17 00:00:00 2001 From: NoFantasy Date: Wed, 9 Dec 2009 12:51:35 +0100 Subject: [PATCH] [8955] Check gossip_menu_option table for GOSSIP_OPTION_NONE and output error if exist Signed-off-by: NoFantasy --- src/game/ObjectMgr.cpp | 3 +++ src/shared/revision_nr.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index d4caed946..b94fd4bd2 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -7993,6 +7993,9 @@ void ObjectMgr::LoadGossipMenuItems() gMenuItem.option_icon = GOSSIP_ICON_CHAT; } + if (gMenuItem.option_id == GOSSIP_OPTION_NONE) + sLog.outErrorDb("Table gossip_menu_option for menu %u, id %u use option id GOSSIP_OPTION_NONE. Option will never be used", gMenuItem.menu_id, gMenuItem.id); + if (gMenuItem.option_id >= GOSSIP_OPTION_MAX) sLog.outErrorDb("Table gossip_menu_option for menu %u, id %u has unknown option id %u. Option will not be used", gMenuItem.menu_id, gMenuItem.id, gMenuItem.option_id); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index ac80e734b..01d674c21 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 "8954" + #define REVISION_NR "8955" #endif // __REVISION_NR_H__