aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDDuarte <dnpd.dd@gmail.com>2015-07-19 21:54:48 +0100
committerDDuarte <dnpd.dd@gmail.com>2015-07-19 21:54:48 +0100
commit57da378dea2b13c092dab71b181c859790e41b99 (patch)
treea1843e87d2831f973eece6df83d1a72b964a8eae
parent4ee4cffb498651c5b9780703e64f535d76505902 (diff)
Core/SAI: Fix some weird code in SmartAIMgr::IsTextValid
Additions to cb0e6cac63638fd229cce16c341c6d3d2d77d0d9
-rw-r--r--src/server/game/AI/SmartScripts/SmartScriptMgr.cpp6
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 dc7a91e23aa..d6db543d4d8 100644
--- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
+++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
@@ -1270,11 +1270,11 @@ bool SmartAIMgr::IsTextValid(SmartScriptHolder const& e, uint32 id)
default:
if (e.entryOrGuid < 0)
{
- entry = uint32(-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 " SI64FMTD " SourceType %u Event %u Action %u using non-existent Creature guid " UI64FMTD ", skipped.", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType(), entry);
+ TC_LOG_ERROR("sql.sql", "SmartAIMgr: Entry " SI64FMTD " SourceType %u Event %u Action %u using non-existent Creature guid " UI64FMTD ", skipped.", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType(), guid);
return false;
}
else