From eef5abe6e1931eeae91d3a1ed68a3bf44237dea2 Mon Sep 17 00:00:00 2001
From: maximius <none@none>
Date: Sun, 13 Sep 2009 00:01:35 -0700
Subject: *Event Hooks (OnLogin, OnLogout, OnPVPKill) by Hawthorne *Boss Emote
 Command for DB Scripts by XTElite1

--HG--
branch : trunk
---
 src/game/ObjectMgr.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/game/ObjectMgr.cpp')

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
     {
-- 
cgit v1.2.3