diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2018-08-22 22:22:24 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-10-22 23:20:36 +0200 |
| commit | f6ceb4bf0c5f95c043e90708e9369f7199a4201b (patch) | |
| tree | fd92120d125985b1112e25b4cb688cf5c4ead65e /src | |
| parent | 6b8329f6af801dae065a15322f07b95e83ed34fc (diff) | |
Scripts/SmartScripts: _SET_IN_COMBAT_WITH_ZONE and _CALL_FOR_HELP no longer use a target. Because that feature made no sense and was unused.
(cherry picked from commit 5706d49e49733f70a6ea2304b7e3671c16ca0c13)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScript.cpp | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index ec639b906e4..d183409eb62 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -1064,32 +1064,24 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u } case SMART_ACTION_SET_IN_COMBAT_WITH_ZONE: { - for (WorldObject* target : targets) + if (me && me->IsAIEnabled) { - if (IsCreature(target)) - { - Creature* creature = target->ToCreature(); - if (creature->IsAIEnabled) - creature->AI()->DoZoneInCombat(); - TC_LOG_DEBUG("scripts.ai", "SmartScript::ProcessAction: SMART_ACTION_SET_IN_COMBAT_WITH_ZONE: Creature %s, target: %s", me->GetGUID().ToString().c_str(), target->GetGUID().ToString().c_str()); - } + me->AI()->DoZoneInCombat(); + TC_LOG_DEBUG("scripts.ai", "SmartScript::ProcessAction: SMART_ACTION_SET_IN_COMBAT_WITH_ZONE: Creature %s", me->GetGUID().ToString().c_str()); } break; } case SMART_ACTION_CALL_FOR_HELP: { - for (WorldObject* target : targets) + if (me) { - if (IsCreature(target)) + me->CallForHelp(float(e.action.callHelp.range)); + if (e.action.callHelp.withEmote) { - target->ToCreature()->CallForHelp(float(e.action.callHelp.range)); - if (e.action.callHelp.withEmote) - { - Trinity::BroadcastTextBuilder builder(me, CHAT_MSG_MONSTER_EMOTE, BROADCAST_TEXT_CALL_FOR_HELP, me->getGender()); - sCreatureTextMgr->SendChatPacket(me, builder, CHAT_MSG_MONSTER_EMOTE); - } - TC_LOG_DEBUG("scripts.ai", "SmartScript::ProcessAction: SMART_ACTION_CALL_FOR_HELP: Creature %s, target: %s", me->GetGUID().ToString().c_str(), target->GetGUID().ToString().c_str()); + Trinity::BroadcastTextBuilder builder(me, CHAT_MSG_MONSTER_EMOTE, BROADCAST_TEXT_CALL_FOR_HELP, me->getGender()); + sCreatureTextMgr->SendChatPacket(me, builder, CHAT_MSG_MONSTER_EMOTE); } + TC_LOG_DEBUG("scripts.ai", "SmartScript::ProcessAction: SMART_ACTION_CALL_FOR_HELP: Creature %s", me->GetGUID().ToString().c_str()); } break; } |