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

fix(Scripts/Hyjal): remove very scary call by reference and posis without initialization (#19046)

Browse Source 
remove call by reference
This commit is contained in:
Dan
2024-06-11 03:32:50 +02:00
committed by GitHub
parent cfcb5d5bd7
commit 9684eb437a
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+5 -14
View File
@@ -141,24 +141,17 @@ private:
struct npc_doomfire_spirit : public ScriptedAI struct npc_doomfire_spirit : public ScriptedAI
{ {
npc_doomfire_spirit(Creature* creature) : ScriptedAI(creature) npc_doomfire_spirit(Creature* creature) : ScriptedAI(creature){ }
{
_instance = creature->GetInstanceScript();
}
void Reset() override void Reset() override
{ {
Position randomPosition;
scheduler.CancelAll(); scheduler.CancelAll();
ScheduleTimedEvent(0s, [&] { ScheduleTimedEvent(0s, [&] {
DoomfireMovement(randomPosition, me->GetPosition()); me->GetMotionMaster()->MovePoint(NEAR_POINT, DoomfireMovement(me->GetPosition()));
me->GetMotionMaster()->MovePoint(NEAR_POINT, randomPosition);
}, 1500ms); }, 1500ms);
} }
void DoomfireMovement(Position& targetPos, Position mePos) Position DoomfireMovement(Position mePos)
{ {
float angle = mePos.GetOrientation(); float angle = mePos.GetOrientation();
float distance = 100.0f; float distance = 100.0f;
@@ -166,8 +159,8 @@ struct npc_doomfire_spirit : public ScriptedAI
float x = mePos.GetPositionX() + distance * cos(newAngle); float x = mePos.GetPositionX() + distance * cos(newAngle);
float y = mePos.GetPositionY() + distance * sin(newAngle); float y = mePos.GetPositionY() + distance * sin(newAngle);
targetPos = Position(x, y, me->GetPositionZ()); Position targetPos = Position(x, y, me->GetPositionZ());
return; return targetPos;
} }
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
@@ -180,8 +173,6 @@ struct npc_doomfire_spirit : public ScriptedAI
if (me->HasUnitState(UNIT_STATE_CASTING)) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
} }
private:
InstanceScript* _instance;
}; };
struct boss_archimonde : public BossAI struct boss_archimonde : public BossAI