diff options
author | Malcrom <malcromdev@gmail.com> | 2012-01-22 12:13:18 -0330 |
---|---|---|
committer | Malcrom <malcromdev@gmail.com> | 2012-01-22 12:13:18 -0330 |
commit | 6cb1c0a988a1e9441c53653c5c5b98b1d1f839ea (patch) | |
tree | f1f674a61086c55f6449616777fc52b5f1e2c00b /src | |
parent | 87ffb6b236a25f79aa922cf1c4c8a1b989c569b3 (diff) | |
parent | 8e8be7e358e4d41932abce81fc8474dfde2afbc3 (diff) |
Merge branch 'master' of git://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/AI/SmartScripts/SmartScript.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 1224be0e1ae..5a235e1e1e4 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -1803,22 +1803,17 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr) { - bool smart = false; SmartAI* ai = NULL; if (IsGameObject(*itr)) - { - smart = IsSmartGO((*itr)->ToGameObject()); ai = CAST_AI(SmartAI, (*itr)->ToGameObject()->AI()); - } if (IsCreature(*itr)) - { - smart = IsSmart((*itr)->ToCreature()); ai = CAST_AI(SmartAI, (*itr)->ToCreature()->AI()); - } - if (smart && ai) + if (ai) ai->GetScript()->StoreTargetList(GetTargetList(e.action.sendTargetToTarget.id), e.action.sendTargetToTarget.id); + else + sLog->outErrorDb("SmartScript: Action target for SMART_ACTION_SEND_TARGET_TO_TARGET is not using SmartAI, skipping"); break; } |