aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Kalimdor
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2015-08-16 22:29:56 +0200
committerjackpoz <giacomopoz@gmail.com>2015-08-16 22:29:56 +0200
commit2f92a2f58e171bbfa6dc06d3b2663cbf384a7d38 (patch)
tree9fb5464872b7d414a7a94c5c2c5b4a1f7048a7a8 /src/server/scripts/Kalimdor
parent418155fe3ae7bd910c833dbe07a64e4c8bdaa064 (diff)
Scripts/Misc: Replace some unsafe WorldObject* class members in scripts with ObjectGuid
Replace some unsafe WorldObject* class members and derived types in scripts with ObjectGuid. Code cleanup.
Diffstat (limited to 'src/server/scripts/Kalimdor')
-rw-r--r--src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp3
-rw-r--r--src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
index 5b338dd8860..f967bd6a217 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
@@ -536,8 +536,7 @@ public:
void SpawnEyeTentacle(float x, float y)
{
- Creature* Spawned;
- Spawned = DoSpawnCreature(NPC_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500);
+ Creature* Spawned = DoSpawnCreature(NPC_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500);
if (Spawned && Spawned->AI())
if (Unit* target = SelectRandomNotStomach())
Spawned->AI()->AttackStart(target);
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
index 65ffb7fd696..b39ce0307a5 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
@@ -559,8 +559,7 @@ public:
if (ArcaneBurst_Timer <= diff)
{
- Unit* mvic;
- if ((mvic=SelectTarget(SELECT_TARGET_NEAREST, 0, NOMINAL_MELEE_RANGE, true)) != NULL)
+ if (Unit* mvic = SelectTarget(SELECT_TARGET_NEAREST, 0, NOMINAL_MELEE_RANGE, true))
{
DoCast(mvic, SPELL_ARCANEBURST);
ArcaneBurst_Timer = 5000;