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

[11982] Fix DB_STRICTED_CHECK output for gossip

Browse source 
This fixes to integrity check to report unused gossip_menu entries. Before only menus used by creatures with gossip_menu_items were reported

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
This commit is contained in:
virusav 2012-05-04 16:05:58 +02:00 • committed by Schmoozerd
parent 67fe27774c
commit ab9b37bf3b
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/game/ObjectMgr.cpp
View file

@ -8698,8 +8698,14 @@ void ObjectMgr::LoadGossipMenuItems(std::set<uint32>& gossipScriptSet)
for (uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i) for (uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i)
if (CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i)) if (CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i))
if (cInfo->GossipMenuId) if (cInfo->GossipMenuId)
{
menu2CInfoMap.insert(Menu2CInfoMap::value_type(cInfo->GossipMenuId, cInfo)); menu2CInfoMap.insert(Menu2CInfoMap::value_type(cInfo->GossipMenuId, cInfo));
// unused check data preparing part
if (!sLog.HasLogFilter(LOG_FILTER_DB_STRICTED_CHECK))
menu_ids.erase(cInfo->GossipMenuId);
}
do do
{ {
bar.step(); bar.step();
@ -8777,7 +8783,7 @@ void ObjectMgr::LoadGossipMenuItems(std::set<uint32>& gossipScriptSet)
if (gMenuItem.option_id >= GOSSIP_OPTION_MAX) 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); 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);
if (gMenuItem.menu_id && (gMenuItem.npc_option_npcflag || !sLog.HasLogFilter(LOG_FILTER_DB_STRICTED_CHECK))) if (gMenuItem.menu_id && gMenuItem.npc_option_npcflag)
{ {
bool found_menu_uses = false; bool found_menu_uses = false;
bool found_flags_uses = false; bool found_flags_uses = false;
@ -8792,10 +8798,6 @@ void ObjectMgr::LoadGossipMenuItems(std::set<uint32>& gossipScriptSet)
// some from creatures with gossip menu can use gossip option base at npc_flags // some from creatures with gossip menu can use gossip option base at npc_flags
if (gMenuItem.npc_option_npcflag & cInfo->npcflag) if (gMenuItem.npc_option_npcflag & cInfo->npcflag)
found_flags_uses = true; found_flags_uses = true;
// unused check data preparing part
if (!sLog.HasLogFilter(LOG_FILTER_DB_STRICTED_CHECK))
menu_ids.erase(gMenuItem.menu_id);
} }
if (found_menu_uses && !found_flags_uses) if (found_menu_uses && !found_flags_uses)

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 "11981" #define REVISION_NR "11982"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__