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

[10893] Speedup check code at gossip_menu_option loading.

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
Warlord123 2010-12-19 21:52:30 +03:00 • committed by VladimirMangos
parent d923302669
commit 3e1c04fc6e
2 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/game/ObjectMgr.cpp
View file

@ -9246,6 +9246,14 @@ void ObjectMgr::LoadGossipMenuItems()
for(ScriptMapMap::const_iterator itr = sGossipScripts.begin(); itr != sGossipScripts.end(); ++itr) for(ScriptMapMap::const_iterator itr = sGossipScripts.begin(); itr != sGossipScripts.end(); ++itr)
gossipScriptSet.insert(itr->first); gossipScriptSet.insert(itr->first);
// prepare menuid -> CreatureInfo map for fast access
typedef std::multimap<uint32, const CreatureInfo*> Menu2CInfoMap;
Menu2CInfoMap menu2CInfoMap;
for(uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i)
if (CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i))
if (cInfo->GossipMenuId)
menu2CInfoMap.insert(Menu2CInfoMap::value_type(cInfo->GossipMenuId, cInfo));
do do
{ {
bar.step(); bar.step();
@ -9326,12 +9334,12 @@ void ObjectMgr::LoadGossipMenuItems()
{ {
bool found_menu_uses = false; bool found_menu_uses = false;
bool found_flags_uses = false; bool found_flags_uses = false;
for(uint32 i = 1; !found_flags_uses && i < sCreatureStorage.MaxEntry; ++i)
{ std::pair<Menu2CInfoMap::const_iterator, Menu2CInfoMap::const_iterator> tm_bounds = menu2CInfoMap.equal_range(gMenuItem.menu_id);
if (CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i)) for (Menu2CInfoMap::const_iterator it2 = tm_bounds.first; !found_flags_uses && it2 != tm_bounds.second; ++it2)
{
if (cInfo->GossipMenuId == gMenuItem.menu_id)
{ {
CreatureInfo const* cInfo = it2->second;
found_menu_uses = true; found_menu_uses = true;
// 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
@ -9340,9 +9348,7 @@ void ObjectMgr::LoadGossipMenuItems()
// unused check data preparing part // unused check data preparing part
if (!sLog.HasLogFilter(LOG_FILTER_DB_STRICTED_CHECK)) if (!sLog.HasLogFilter(LOG_FILTER_DB_STRICTED_CHECK))
menu_ids.erase(cInfo->GossipMenuId); 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 "10892" #define REVISION_NR "10893"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__