diff options
author | XTZGZoReX <none@none> | 2010-08-06 18:03:09 +0200 |
---|---|---|
committer | XTZGZoReX <none@none> | 2010-08-06 18:03:09 +0200 |
commit | b63a31f513db5274e85afc323d143292d8f3e88f (patch) | |
tree | 7b8300182cdf20994c132be1aa39ab89bce3df84 /src/server/game/Globals/ObjectMgr.cpp | |
parent | edc4c3317c8e6db6f67d71eb135c084970401fd1 (diff) |
* Added outdoorpvp_template table (currently unused).
* Added DISABLE_TYPE_OUTDOORPVP (5) which can disable outdoorpvp_template entries.
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 23ce129d0d3..5b811d54fe2 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -8750,6 +8750,8 @@ void ObjectMgr::LoadScriptNames() "UNION " "SELECT DISTINCT(ScriptName) FROM conditions WHERE ScriptName <> '' " "UNION " + "SELECT DISTINCT(ScriptName) FROM outdoorpvp_template WHERE ScriptName <> '' " + "UNION " "SELECT DISTINCT(script) FROM instance_template WHERE script <> ''"); if (!result) @@ -8772,7 +8774,8 @@ void ObjectMgr::LoadScriptNames() bar.step(); m_scriptNames.push_back((*result)[0].GetString()); ++count; - } while (result->NextRow()); + } + while (result->NextRow()); std::sort(m_scriptNames.begin(), m_scriptNames.end()); sLog.outString(); |