diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2015-07-20 01:16:06 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-07-20 01:16:06 +0100 |
| commit | 24ae640de39a21f54f60a97483ba254355fd0787 (patch) | |
| tree | 1ed50edef08c9aba841b6c320214858742b8d39c /src | |
| parent | 0350088fd231a4727890d4a2955798e8655fe796 (diff) | |
Core/SAI: Fix some weird code in SmartAIMgr::IsTextValid
Additions to cb0e6cac63638fd229cce16c341c6d3d2d77d0d9
(cherry picked from commit 57da378dea2b13c092dab71b181c859790e41b99)
Conflicts:
src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScriptMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index 37187d9b04c..013acd2e314 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -1228,11 +1228,11 @@ bool SmartAIMgr::IsTextValid(SmartScriptHolder const& e, uint32 id) default: if (e.entryOrGuid < 0) { - entry = uint32(std::abs(e.entryOrGuid)); - CreatureData const* data = sObjectMgr->GetCreatureData(entry); + ObjectGuid::LowType guid = ObjectGuid::LowType(-e.entryOrGuid); + CreatureData const* data = sObjectMgr->GetCreatureData(guid); if (!data) { - TC_LOG_ERROR("sql.sql", "SmartAIMgr: Entry %d SourceType %u Event %u Action %u using non-existent Creature guid %d, skipped.", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType(), entry); + TC_LOG_ERROR("sql.sql", "SmartAIMgr: Entry %d SourceType %u Event %u Action %u using non-existent Creature guid %d, skipped.", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType(), guid); return false; } else |