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

Refactored db_scripts

Browse source 
The unity! - Based on the original work of H0zen for Zero.
This commit is contained in:
Antz 2017-01-20 00:10:08 +00:00 • committed by Antz
parent a92011c6bf
commit 695651324c
15 changed files with 415 additions and 482 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/game/Object/ObjectMgr.cpp
View file

@ -9672,9 +9672,13 @@ void ObjectMgr::LoadGossipMenu(std::set<uint32>& gossipScriptSet)
// Check script-id
if (gMenu.script_id)
{
if (sGossipScripts.second.find(gMenu.script_id) == sGossipScripts.second.end())
ScriptChainMap const* scm = sScriptMgr.GetScriptChainMap(DBS_ON_GOSSIP);
if (!scm)
continue;
if (scm->find(gMenu.script_id) == scm->end())
{
sLog.outErrorDb("Table gossip_menu for menu %u, text-id %u have script_id %u that does not exist in `dbscripts_on_gossip`, ignoring", gMenu.entry, gMenu.text_id, gMenu.script_id);
sLog.outErrorDb("Table gossip_menu for menu %u, text-id %u have script_id %u that does not exist in `db_scripts [type = %d]`, ignoring", gMenu.entry, gMenu.text_id, gMenu.script_id, DBS_ON_GOSSIP);
continue;
}
@ -9853,9 +9857,13 @@ void ObjectMgr::LoadGossipMenuItems(std::set<uint32>& gossipScriptSet)
if (gMenuItem.action_script_id)
{
if (sGossipScripts.second.find(gMenuItem.action_script_id) == sGossipScripts.second.end())
ScriptChainMap const* scm = sScriptMgr.GetScriptChainMap(DBS_ON_GOSSIP);
if (!scm)
continue;
if (scm->find(gMenuItem.action_script_id) == scm->end())
{
sLog.outErrorDb("Table gossip_menu_option for menu %u, id %u have action_script_id %u that does not exist in `dbscripts_on_gossip`, ignoring", gMenuItem.menu_id, gMenuItem.id, gMenuItem.action_script_id);
sLog.outErrorDb("Table gossip_menu_option for menu %u, id %u have action_script_id %u that does not exist in `db_scripts [type = %d]`, ignoring", gMenuItem.menu_id, gMenuItem.id, gMenuItem.action_script_id, DBS_ON_GOSSIP);
continue;
}
@ -9893,10 +9901,14 @@ void ObjectMgr::LoadGossipMenuItems(std::set<uint32>& gossipScriptSet)
void ObjectMgr::LoadGossipMenus()
{
// Check which script-ids in dbscripts_on_gossip are not used
ScriptChainMap const* scm = sScriptMgr.GetScriptChainMap(DBS_ON_GOSSIP);
if (!scm)
return;
// Check which script-ids in db_scripts type DBS_ON_GOSSIP are not used
std::set<uint32> gossipScriptSet;
for (ScriptMapMap::const_iterator itr = sGossipScripts.second.begin(); itr != sGossipScripts.second.end(); ++itr)
gossipScriptSet.insert(itr->first);
for (ScriptChainMap::const_iterator itr = scm->begin(); itr != scm->end(); ++itr)
{ gossipScriptSet.insert(itr->first); }
// Load gossip_menu and gossip_menu_option data
sLog.outString("(Re)Loading Gossip menus...");
@ -9905,7 +9917,7 @@ void ObjectMgr::LoadGossipMenus()
LoadGossipMenuItems(gossipScriptSet);
for (std::set<uint32>::const_iterator itr = gossipScriptSet.begin(); itr != gossipScriptSet.end(); ++itr)
sLog.outErrorDb("Table `dbscripts_on_gossip` contains unused script, id %u.", *itr);
{ sLog.outErrorDb("Table `db_scripts [type = %d]` contains unused script, id %u.", DBS_ON_GOSSIP, *itr); }
}
void ObjectMgr::AddVendorItem(uint32 entry, uint32 item, uint8 type, uint32 maxcount, uint32 incrtime, uint32 extendedcost)