diff options
| author | maximius <none@none> | 2009-09-13 00:01:35 -0700 |
|---|---|---|
| committer | maximius <none@none> | 2009-09-13 00:01:35 -0700 |
| commit | eef5abe6e1931eeae91d3a1ed68a3bf44237dea2 (patch) | |
| tree | b4d2edf33613bfefe67bd534b0e3fe9622617ff7 /src/game/ObjectMgr.cpp | |
| parent | c61bb37a0e80aae1dc24618782647c43d2feb174 (diff) | |
*Event Hooks (OnLogin, OnLogout, OnPVPKill) by Hawthorne
*Boss Emote Command for DB Scripts by XTElite1
--HG--
branch : trunk
Diffstat (limited to 'src/game/ObjectMgr.cpp')
| -rw-r--r-- | src/game/ObjectMgr.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index a1e19eb178a..2f4bad688ef 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -4297,7 +4297,7 @@ void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename) { case SCRIPT_COMMAND_TALK: { - if(tmp.datalong > 3) + if(tmp.datalong > 4) { sLog.outErrorDb("Table `%s` has invalid talk type (datalong = %u) in SCRIPT_COMMAND_TALK for script id %u",tablename,tmp.datalong,tmp.id); continue; @@ -8377,7 +8377,10 @@ void ObjectMgr::LoadScriptNames() } barGoLink bar( result->GetRowCount() ); - uint32 count = 0; + + //OnEvent Changes + m_scriptNames.push_back("scripted_on_events"); + uint32 count = 1; do { |