diff options
| author | megamage <none@none> | 2009-01-06 12:15:18 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-06 12:15:18 -0600 |
| commit | 2b21f0e7302cfdb0fc79e3255f80dc33b939c974 (patch) | |
| tree | c1fb071d3c86ead192f9cbf7acffa06c050cd4d5 /src/bindings/scripts/ScriptMgr.cpp | |
| parent | 215039055bf5f017870d583c60c01c303d1a2d33 (diff) | |
| parent | 290a187592d28cbfd9639ded43663077711f3379 (diff) | |
*Merge with Trinity 793.
--HG--
branch : trunk
Diffstat (limited to 'src/bindings/scripts/ScriptMgr.cpp')
| -rw-r--r-- | src/bindings/scripts/ScriptMgr.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp index d28a17b9104..a4d75f6aeb2 100644 --- a/src/bindings/scripts/ScriptMgr.cpp +++ b/src/bindings/scripts/ScriptMgr.cpp @@ -656,7 +656,8 @@ void LoadDatabase() LoadTrinityStrings(TScriptDB,"eventai_texts",-1,1+(TEXT_SOURCE_RANGE)); // Gather Additional data from EventAI Texts - result = TScriptDB.PQuery("SELECT entry, sound, type, language, emote FROM eventai_texts"); + //result = TScriptDB.PQuery("SELECT entry, sound, type, language, emote FROM eventai_texts"); + result = TScriptDB.PQuery("SELECT entry, sound, type, language FROM eventai_texts"); outstring_log("TSCR: Loading EventAI Texts additional data..."); if (result) @@ -674,7 +675,7 @@ void LoadDatabase() temp.SoundId = fields[1].GetInt32(); temp.Type = fields[2].GetInt32(); temp.Language = fields[3].GetInt32(); - temp.Emote = fields[4].GetInt32(); + temp.Emote = 0;//fields[4].GetInt32(); if (i >= 0) { |