sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "fix (core): Smart Script Clean up\Code Reduction (#10491)" (#10494)

Browse Source 
This reverts commit 0a218c975f.
Memory Leak Issue is being identified by a few fellow devs in response to the clean up.
This commit is contained in:
acidmanifesto
2022-02-02 13:43:48 -05:00
committed by GitHub
parent 0a218c975f
commit 48ad8b519b
1 changed files with 146 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/SmartScripts/SmartScript.cpp
+146 -30
View File
@@ -118,7 +118,6 @@ void SmartScript::ProcessEventsFor(SMART_EVENT e, Unit* unit, uint32 var0, uint3
void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, uint32 var1, bool bvar, const SpellInfo* spell, GameObject* gob) void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, uint32 var1, bool bvar, const SpellInfo* spell, GameObject* gob)
{ {
ObjectList* targets = GetTargets(e, unit);
//calc random //calc random
if (e.GetEventType() != SMART_EVENT_LINK && e.event.event_chance < 100 && e.event.event_chance) if (e.GetEventType() != SMART_EVENT_LINK && e.event.event_chance < 100 && e.event.event_chance)
{ {
@@ -140,6 +139,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
{ {
case SMART_ACTION_TALK: case SMART_ACTION_TALK:
{ {
ObjectList* targets = GetTargets(e, unit);
Creature* talker = e.target.type == 0 ? me : nullptr; Creature* talker = e.target.type == 0 ? me : nullptr;
Unit* talkTarget = nullptr; Unit* talkTarget = nullptr;
if (targets) if (targets)
@@ -190,6 +190,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SIMPLE_TALK: case SMART_ACTION_SIMPLE_TALK:
{ {
ObjectList* targets = GetTargets(e, unit);
if (targets) if (targets)
{ {
for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr) for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr)
@@ -211,6 +212,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_PLAY_EMOTE: case SMART_ACTION_PLAY_EMOTE:
{ {
ObjectList* targets = GetTargets(e, unit);
if (targets) if (targets)
{ {
for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr) for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr)
@@ -229,6 +231,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SOUND: case SMART_ACTION_SOUND:
{ {
ObjectList* targets = GetTargets(e, unit);
if (targets) if (targets)
{ {
for (auto& target : *targets) for (auto& target : *targets)
@@ -250,6 +253,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_RANDOM_SOUND: case SMART_ACTION_RANDOM_SOUND:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -415,6 +419,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_FACTION: case SMART_ACTION_SET_FACTION:
{ {
ObjectList* targets = GetTargets(e, unit);
if (targets) if (targets)
{ {
for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr) for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr)
@@ -448,6 +453,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_MORPH_TO_ENTRY_OR_MODEL: case SMART_ACTION_MORPH_TO_ENTRY_OR_MODEL:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -490,6 +496,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_FAIL_QUEST: case SMART_ACTION_FAIL_QUEST:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -508,6 +515,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_OFFER_QUEST: case SMART_ACTION_OFFER_QUEST:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -543,6 +551,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_REACT_STATE: case SMART_ACTION_SET_REACT_STATE:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -559,6 +568,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_RANDOM_EMOTE: case SMART_ACTION_RANDOM_EMOTE:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -622,6 +632,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (!me) if (!me)
break; break;
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -640,6 +651,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_CALL_AREAEXPLOREDOREVENTHAPPENS: case SMART_ACTION_CALL_AREAEXPLOREDOREVENTHAPPENS:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -667,6 +679,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_CAST: case SMART_ACTION_CAST:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -730,6 +743,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (!tempLastInvoker) if (!tempLastInvoker)
break; break;
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -755,6 +769,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_ADD_AURA: case SMART_ACTION_ADD_AURA:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -773,6 +788,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_ACTIVATE_GOBJECT: case SMART_ACTION_ACTIVATE_GOBJECT:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -798,6 +814,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_RESET_GOBJECT: case SMART_ACTION_RESET_GOBJECT:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -816,6 +833,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_EMOTE_STATE: case SMART_ACTION_SET_EMOTE_STATE:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -834,6 +852,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_UNIT_FLAG: case SMART_ACTION_SET_UNIT_FLAG:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -861,6 +880,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_REMOVE_UNIT_FLAG: case SMART_ACTION_REMOVE_UNIT_FLAG:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -940,6 +960,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (!GetBaseObject()) if (!GetBaseObject())
break; break;
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -979,6 +1000,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (!GetBaseObject()) if (!GetBaseObject())
break; break;
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -998,6 +1020,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_REMOVEAURASFROMSPELL: case SMART_ACTION_REMOVEAURASFROMSPELL:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1031,6 +1054,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (!IsSmart()) if (!IsSmart())
break; break;
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
{ {
CAST_AI(SmartAI, me->AI())->StopFollow(false); CAST_AI(SmartAI, me->AI())->StopFollow(false);
@@ -1117,6 +1141,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
else // Specific target type else // Specific target type
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1189,6 +1214,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
break; break;
} }
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1199,6 +1225,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_UPDATE_TEMPLATE: case SMART_ACTION_UPDATE_TEMPLATE:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1220,6 +1247,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_IN_COMBAT_WITH_ZONE: case SMART_ACTION_SET_IN_COMBAT_WITH_ZONE:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1247,6 +1275,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_CALL_FOR_HELP: case SMART_ACTION_CALL_FOR_HELP:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1278,6 +1307,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_FORCE_DESPAWN: case SMART_ACTION_FORCE_DESPAWN:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1307,6 +1337,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_INGAME_PHASE_MASK: case SMART_ACTION_SET_INGAME_PHASE_MASK:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1323,6 +1354,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_MOUNT_TO_ENTRY_OR_MODEL: case SMART_ACTION_MOUNT_TO_ENTRY_OR_MODEL:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1350,6 +1382,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_INVINCIBILITY_HP_LEVEL: case SMART_ACTION_SET_INVINCIBILITY_HP_LEVEL:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1373,6 +1406,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_DATA: case SMART_ACTION_SET_DATA:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1407,6 +1441,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_VISIBILITY: case SMART_ACTION_SET_VISIBILITY:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1419,6 +1454,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_ACTIVE: case SMART_ACTION_SET_ACTIVE:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1433,6 +1469,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (!me) if (!me)
break; break;
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1445,6 +1482,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_ATTACK_STOP: case SMART_ACTION_ATTACK_STOP:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
{ {
break; break;
@@ -1461,6 +1499,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SUMMON_CREATURE: case SMART_ACTION_SUMMON_CREATURE:
{ {
ObjectList* targets = GetTargets(e, unit);
WorldObject* summoner = GetBaseObject() ? GetBaseObject() : unit; WorldObject* summoner = GetBaseObject() ? GetBaseObject() : unit;
if (!summoner) if (!summoner)
break; break;
@@ -1528,6 +1567,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (!GetBaseObject()) if (!GetBaseObject())
break; break;
ObjectList* targets = GetTargets(e, unit);
if (targets) if (targets)
{ {
float x, y, z, o; float x, y, z, o;
@@ -1559,6 +1599,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_KILL_UNIT: case SMART_ACTION_KILL_UNIT:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1580,6 +1621,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_ADD_ITEM: case SMART_ACTION_ADD_ITEM:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1596,6 +1638,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_REMOVE_ITEM: case SMART_ACTION_REMOVE_ITEM:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1612,11 +1655,13 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_STORE_TARGET_LIST: case SMART_ACTION_STORE_TARGET_LIST:
{ {
ObjectList* targets = GetTargets(e, unit);
StoreTargetList(targets, e.action.storeTargets.id); StoreTargetList(targets, e.action.storeTargets.id);
break; break;
} }
case SMART_ACTION_TELEPORT: case SMART_ACTION_TELEPORT:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1647,6 +1692,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_RUN: case SMART_ACTION_SET_RUN:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1712,6 +1758,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
// Xinef: ensure that SMART_ESCORT_TARGETS contains at least one player reference // Xinef: ensure that SMART_ESCORT_TARGETS contains at least one player reference
bool stored = false; bool stored = false;
ObjectList* targets = GetTargets(e, unit);
if (targets) if (targets)
{ {
for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr) for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr)
@@ -1767,44 +1814,48 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
break; break;
} }
case SMART_ACTION_SET_ORIENTATION: case SMART_ACTION_SET_ORIENTATION:
{ {
if (!me) if (!me)
break; break;
if (e.action.orientation.random > 0) if (e.action.orientation.random > 0)
{ {
float randomOri = frand(0.0f, 2 * M_PI); float randomOri = frand(0.0f, 2 * M_PI);
me->SetFacingTo(randomOri); me->SetFacingTo(randomOri);
if (e.action.orientation.quickChange) if (e.action.orientation.quickChange)
me->SetOrientation(randomOri); me->SetOrientation(randomOri);
break; break;
} }
if (e.GetTargetType() == SMART_TARGET_SELF)
{ if (e.GetTargetType() == SMART_TARGET_SELF)
me->SetFacingTo((me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && me->GetTransGUID() ? me->GetTransportHomePosition() : me->GetHomePosition()).GetOrientation()); {
if (e.action.orientation.quickChange) me->SetFacingTo((me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && me->GetTransGUID() ? me->GetTransportHomePosition() : me->GetHomePosition()).GetOrientation());
me->SetOrientation((me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && me->GetTransGUID() ? me->GetTransportHomePosition() : me->GetHomePosition()).GetOrientation()); if (e.action.orientation.quickChange)
} me->SetOrientation((me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && me->GetTransGUID() ? me->GetTransportHomePosition() : me->GetHomePosition()).GetOrientation());
else if (e.GetTargetType() == SMART_TARGET_POSITION) }
{ else if (e.GetTargetType() == SMART_TARGET_POSITION)
me->SetFacingTo(e.target.o);
if (e.action.orientation.quickChange)
me->SetOrientation(e.target.o);
}
else if (targets)
{
if (!targets->empty())
{ {
me->SetFacingTo(e.target.o); me->SetFacingTo(e.target.o);
if (e.action.orientation.quickChange) if (e.action.orientation.quickChange)
me->SetOrientation(e.target.o); me->SetOrientation(e.target.o);
} }
delete targets; else if (ObjectList* targets = GetTargets(e, unit))
{
if (!targets->empty())
{
me->SetFacingToObject(*targets->begin());
if (e.action.orientation.quickChange)
me->SetInFront(*targets->begin());
}
delete targets;
}
break;
} }
break;
}
case SMART_ACTION_PLAYMOVIE: case SMART_ACTION_PLAYMOVIE:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1885,6 +1936,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_MOVE_TO_POS_TARGET: case SMART_ACTION_MOVE_TO_POS_TARGET:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
return; return;
@@ -1902,6 +1954,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_RESPAWN_TARGET: case SMART_ACTION_RESPAWN_TARGET:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1924,6 +1977,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_CLOSE_GOSSIP: case SMART_ACTION_CLOSE_GOSSIP:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -1936,6 +1990,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_EQUIP: case SMART_ACTION_EQUIP:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2017,6 +2072,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
break; break;
case SMART_ACTION_OVERRIDE_SCRIPT_BASE_OBJECT: case SMART_ACTION_OVERRIDE_SCRIPT_BASE_OBJECT:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2061,6 +2117,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
float attackDistance = float(e.action.setRangedMovement.distance); float attackDistance = float(e.action.setRangedMovement.distance);
float attackAngle = float(e.action.setRangedMovement.angle) / 180.0f * M_PI; float attackAngle = float(e.action.setRangedMovement.angle) / 180.0f * M_PI;
ObjectList* targets = GetTargets(e, unit);
if (targets) if (targets)
{ {
for (ObjectList::iterator itr = targets->begin(); itr != targets->end(); ++itr) for (ObjectList::iterator itr = targets->begin(); itr != targets->end(); ++itr)
@@ -2103,6 +2160,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_NPC_FLAG: case SMART_ACTION_SET_NPC_FLAG:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2115,6 +2173,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_ADD_NPC_FLAG: case SMART_ACTION_ADD_NPC_FLAG:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2127,6 +2186,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_REMOVE_NPC_FLAG: case SMART_ACTION_REMOVE_NPC_FLAG:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2143,6 +2203,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (!casters) if (!casters)
break; break;
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
{ {
delete casters; // casters already validated, delete now delete casters; // casters already validated, delete now
@@ -2211,6 +2272,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
break; break;
} }
ObjectList* targets = GetTargets(e, unit);
if (targets) if (targets)
{ {
for (ObjectList::iterator itr = targets->begin(); itr != targets->end(); ++itr) for (ObjectList::iterator itr = targets->begin(); itr != targets->end(); ++itr)
@@ -2240,6 +2302,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
break; break;
} }
ObjectList* targets = GetTargets(e, unit);
if (targets) if (targets)
{ {
for (ObjectList::iterator itr = targets->begin(); itr != targets->end(); ++itr) for (ObjectList::iterator itr = targets->begin(); itr != targets->end(); ++itr)
@@ -2262,6 +2325,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_ACTIVATE_TAXI: case SMART_ACTION_ACTIVATE_TAXI:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2274,6 +2338,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_RANDOM_MOVE: case SMART_ACTION_RANDOM_MOVE:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2305,6 +2370,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_UNIT_FIELD_BYTES_1: case SMART_ACTION_SET_UNIT_FIELD_BYTES_1:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr) for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr)
@@ -2316,6 +2382,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_REMOVE_UNIT_FIELD_BYTES_1: case SMART_ACTION_REMOVE_UNIT_FIELD_BYTES_1:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2328,6 +2395,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_INTERRUPT_SPELL: case SMART_ACTION_INTERRUPT_SPELL:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2340,6 +2408,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SEND_GO_CUSTOM_ANIM: case SMART_ACTION_SEND_GO_CUSTOM_ANIM:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2352,6 +2421,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_DYNAMIC_FLAG: case SMART_ACTION_SET_DYNAMIC_FLAG:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2364,6 +2434,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_ADD_DYNAMIC_FLAG: case SMART_ACTION_ADD_DYNAMIC_FLAG:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2376,6 +2447,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_REMOVE_DYNAMIC_FLAG: case SMART_ACTION_REMOVE_DYNAMIC_FLAG:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2401,6 +2473,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
break; break;
} }
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2426,6 +2499,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_GO_SET_LOOT_STATE: case SMART_ACTION_GO_SET_LOOT_STATE:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2438,6 +2512,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_GO_SET_GO_STATE: case SMART_ACTION_GO_SET_GO_STATE:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
{ {
break; break;
@@ -2456,6 +2532,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SEND_TARGET_TO_TARGET: case SMART_ACTION_SEND_TARGET_TO_TARGET:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2494,6 +2571,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
LOG_DEBUG("sql.sql", "SmartScript::ProcessAction:: SMART_ACTION_SEND_GOSSIP_MENU: gossipMenuId {}, gossipNpcTextId {}", LOG_DEBUG("sql.sql", "SmartScript::ProcessAction:: SMART_ACTION_SEND_GOSSIP_MENU: gossipMenuId {}, gossipNpcTextId {}",
e.action.sendGossipMenu.gossipMenuId, e.action.sendGossipMenu.gossipNpcTextId); e.action.sendGossipMenu.gossipMenuId, e.action.sendGossipMenu.gossipNpcTextId);
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2513,6 +2591,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_HOME_POS: case SMART_ACTION_SET_HOME_POS:
{ {
ObjectList* targets = GetTargets(e, unit);
if (targets) if (targets)
{ {
float x, y, z, o; float x, y, z, o;
@@ -2568,6 +2647,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
}*/ }*/
case SMART_ACTION_SET_HEALTH_REGEN: case SMART_ACTION_SET_HEALTH_REGEN:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2580,6 +2660,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_ROOT: case SMART_ACTION_SET_ROOT:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2592,6 +2673,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_GO_FLAG: case SMART_ACTION_SET_GO_FLAG:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2604,6 +2686,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_ADD_GO_FLAG: case SMART_ACTION_ADD_GO_FLAG:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2616,6 +2699,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_REMOVE_GO_FLAG: case SMART_ACTION_REMOVE_GO_FLAG:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2643,6 +2727,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_POWER: case SMART_ACTION_SET_POWER:
{ {
ObjectList* targets = GetTargets(e, unit);
if (targets) if (targets)
for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr) for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr)
if (IsUnit(*itr)) if (IsUnit(*itr))
@@ -2653,6 +2739,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_ADD_POWER: case SMART_ACTION_ADD_POWER:
{ {
ObjectList* targets = GetTargets(e, unit);
if (targets) if (targets)
for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr) for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr)
if (IsUnit(*itr)) if (IsUnit(*itr))
@@ -2663,6 +2751,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_REMOVE_POWER: case SMART_ACTION_REMOVE_POWER:
{ {
ObjectList* targets = GetTargets(e, unit);
if (targets) if (targets)
for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr) for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr)
if (IsUnit(*itr)) if (IsUnit(*itr))
@@ -2705,6 +2795,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
float distanceToClosest = std::numeric_limits<float>::max(); float distanceToClosest = std::numeric_limits<float>::max();
WayPoint* closestWp = nullptr; WayPoint* closestWp = nullptr;
ObjectList* targets = GetTargets(e, unit);
if (targets) if (targets)
{ {
for (ObjectList::iterator itr = targets->begin(); itr != targets->end(); ++itr) for (ObjectList::iterator itr = targets->begin(); itr != targets->end(); ++itr)
@@ -2752,6 +2843,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_GO_STATE: case SMART_ACTION_SET_GO_STATE:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2764,6 +2856,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_EXIT_VEHICLE: case SMART_ACTION_EXIT_VEHICLE:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2776,6 +2869,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_UNIT_MOVEMENT_FLAGS: case SMART_ACTION_SET_UNIT_MOVEMENT_FLAGS:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2791,6 +2885,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_COMBAT_DISTANCE: case SMART_ACTION_SET_COMBAT_DISTANCE:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2814,6 +2909,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_SIGHT_DIST: case SMART_ACTION_SET_SIGHT_DIST:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2826,6 +2922,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_FLEE: case SMART_ACTION_FLEE:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2838,6 +2935,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_ADD_THREAT: case SMART_ACTION_ADD_THREAT:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2850,6 +2948,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_LOAD_EQUIPMENT: case SMART_ACTION_LOAD_EQUIPMENT:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2868,6 +2967,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_HOVER: case SMART_ACTION_SET_HOVER:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2880,6 +2980,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_ADD_IMMUNITY: case SMART_ACTION_ADD_IMMUNITY:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2892,6 +2993,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_REMOVE_IMMUNITY: case SMART_ACTION_REMOVE_IMMUNITY:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2904,6 +3006,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_FALL: case SMART_ACTION_FALL:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2921,6 +3024,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_REMOVE_ALL_GAMEOBJECTS: case SMART_ACTION_REMOVE_ALL_GAMEOBJECTS:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2933,6 +3037,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_STOP_MOTION: case SMART_ACTION_STOP_MOTION:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2950,6 +3055,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_NO_ENVIRONMENT_UPDATE: case SMART_ACTION_NO_ENVIRONMENT_UPDATE:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2962,6 +3068,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_ZONE_UNDER_ATTACK: case SMART_ACTION_ZONE_UNDER_ATTACK:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -2984,6 +3091,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_PLAYER_TALK: case SMART_ACTION_PLAYER_TALK:
{ {
ObjectList* targets = GetTargets(e, unit);
char const* text = sObjectMgr->GetAcoreString(e.action.playerTalk.textId, DEFAULT_LOCALE); char const* text = sObjectMgr->GetAcoreString(e.action.playerTalk.textId, DEFAULT_LOCALE);
if (targets) if (targets)
@@ -2999,6 +3107,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (!me) if (!me)
break; break;
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -3048,6 +3157,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (!me) if (!me)
break; break;
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -3132,6 +3242,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_CU_ENCOUNTER_START: case SMART_ACTION_CU_ENCOUNTER_START:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
break; break;
@@ -3155,6 +3266,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
int32 const actionId = e.action.doAction.isNegative ? -e.action.doAction.actionId : e.action.doAction.actionId; int32 const actionId = e.action.doAction.isNegative ? -e.action.doAction.actionId : e.action.doAction.actionId;
if (!e.action.doAction.instanceTarget) if (!e.action.doAction.instanceTarget)
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
{ {
break; break;
@@ -3207,6 +3319,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_CORPSE_DELAY: case SMART_ACTION_SET_CORPSE_DELAY:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
{ {
break; break;
@@ -3225,6 +3338,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_SET_HEALTH_PCT: case SMART_ACTION_SET_HEALTH_PCT:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
{ {
break; break;
@@ -3247,6 +3361,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
uint32 speedFraction = e.action.movementSpeed.speedFraction; uint32 speedFraction = e.action.movementSpeed.speedFraction;
float speed = float(speedInteger) + float(speedFraction) / std::pow(10, std::floor(std::log10(float(speedFraction ? speedFraction : 1)) + 1)); float speed = float(speedInteger) + float(speedFraction) / std::pow(10, std::floor(std::log10(float(speedFraction ? speedFraction : 1)) + 1));
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
{ {
break; break;
@@ -3265,6 +3380,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
case SMART_ACTION_PLAY_CINEMATIC: case SMART_ACTION_PLAY_CINEMATIC:
{ {
ObjectList* targets = GetTargets(e, unit);
if (!targets) if (!targets)
{ {
break; break;