rendered paste bodyIndex: scripts/zone/zulgurub/boss_mandokir.cpp
===================================================================
--- scripts/zone/zulgurub/boss_mandokir.cpp (revision 275)
+++ scripts/zone/zulgurub/boss_mandokir.cpp (working copy)
@@ -190,7 +190,7 @@
{
m_creature->Unmount(); //At combat Start Mandokir is mounted so we must unmount it first
//And summon his raptor
- Raptor = m_creature->SummonCreature(14988, m_creature->getVictim()->GetPositionX(), m_creature->getVictim()->GetPositionY(), m_creature->getVictim()->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 35000);
+ Raptor = m_creature->SummonCreature(14988, m_creature->getVictim()->GetPositionX(), m_creature->getVictim()->GetPositionY(), m_creature->getVictim()->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 35000);
CombatStart = true;
}
Index: scripts/zone/zulgurub/boss_marli.cpp
===================================================================
--- scripts/zone/zulgurub/boss_marli.cpp (revision 275)
+++ scripts/zone/zulgurub/boss_marli.cpp (working copy)
@@ -184,13 +184,13 @@
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0);
- Spider = m_creature->SummonCreature(15041,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
+ Spider = m_creature->SummonCreature(15041, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
if(target && Spider ) { Spider ->AI()->AttackStart(target); }
- Spider = m_creature->SummonCreature(15041,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
+ Spider = m_creature->SummonCreature(15041, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
if(target && Spider ) { Spider ->AI()->AttackStart(target); }
- Spider = m_creature->SummonCreature(15041,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
+ Spider = m_creature->SummonCreature(15041, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
if(target && Spider ) { Spider ->AI()->AttackStart(target); }
- Spider = m_creature->SummonCreature(15041,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
+ Spider = m_creature->SummonCreature(15041, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
if(target && Spider ) { Spider ->AI()->AttackStart(target); }
Spawned = true;
@@ -202,7 +202,7 @@
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0);
- Spider = m_creature->SummonCreature(15041,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
+ Spider = m_creature->SummonCreature(15041, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
if(target && Spider ) { Spider ->AI()->AttackStart(target); }
SpawnSpider_Timer = 12000 + rand()%5000;
Index: scripts/zone/black_temple/boss_teron_gorefiend.cpp
===================================================================
--- scripts/zone/black_temple/boss_teron_gorefiend.cpp (revision 275)
+++ scripts/zone/black_temple/boss_teron_gorefiend.cpp (working copy)
@@ -338,14 +338,14 @@
if(SummonShadowsTimer < diff)
{
Creature* Shadow1 = NULL;
- Shadow1 = m_creature->SummonCreature(23111, m_creature->GetPositionX()+20, m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Shadow1 = m_creature->SummonCreature(23111, m_creature->GetPositionX()+20, m_creature->GetPositionY(), m_creature->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
Shadow1->CastSpell(Shadow1, SPELL_PASSIVE_SHADOWFORM, true);
Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
if(target && Shadow1)
Shadow1->AddThreat(target, 1.0f);
Creature* Shadow2 = NULL;
- Shadow2 = m_creature->SummonCreature(23111, m_creature->GetPositionX()-20,m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Shadow2 = m_creature->SummonCreature(23111, m_creature->GetPositionX()-20,m_creature->GetPositionY(), m_creature->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
Shadow2->CastSpell(Shadow2, SPELL_PASSIVE_SHADOWFORM, true);
Unit* target2 = SelectUnit(SELECT_TARGET_RANDOM, 0);
if(target2 && Shadow2)
@@ -362,7 +362,7 @@
float X = CalculateRandomLocation(m_creature->GetPositionX());
float Y = CalculateRandomLocation(m_creature->GetPositionY());
Creature* DoomBlossom = NULL;
- DoomBlossom = m_creature->SummonCreature(23123, X, Y, m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 20000);
+ DoomBlossom = m_creature->SummonCreature(23123, X, Y, m_creature->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 20000);
if(DoomBlossom)
{
DoomBlossom->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
Index: scripts/zone/black_temple/boss_illidan.cpp
===================================================================
--- scripts/zone/black_temple/boss_illidan.cpp (revision 275)
+++ scripts/zone/black_temple/boss_illidan.cpp (working copy)
@@ -592,11 +592,11 @@
float final_Y = EyeBlast[final].y;
float final_Z = EyeBlast[final].z;
Creature* BlastTrigger = NULL; // This mob will have fun running across the summit and spawning Demon Fires
- BlastTrigger = m_creature->SummonCreature(CREATURE_TARGET_TRIGGER, initial_X, initial_Y, initial_Z, 0, TEMPSUMMON_TIMED_DESPAWN, 40000);
+ BlastTrigger = m_creature->SummonCreature(CREATURE_TARGET_TRIGGER, initial_X, initial_Y, initial_Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 40000);
Creature* BlueFlame = NULL; // This mob just does the Blue Flame animation. It follows close behind BlastTrigger...cosmetics ftw.
- BlueFlame = m_creature->SummonCreature(CREATURE_TARGET_TRIGGER, initial_X,initial_Y,initial_Z,0,TEMPSUMMON_TIMED_DESPAWN,40000);
+ BlueFlame = m_creature->SummonCreature(CREATURE_TARGET_TRIGGER, initial_X,initial_Y, initial_Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 40000);
Creature* MoveTarget = NULL; // This is the mob that BlastTrigger will run towards.
- MoveTarget = m_creature->SummonCreature(CREATURE_TARGET_TRIGGER,final_X,final_Y,final_Z,0,TEMPSUMMON_TIMED_DESPAWN, 40000);
+ MoveTarget = m_creature->SummonCreature(CREATURE_TARGET_TRIGGER, final_X, final_Y, final_Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 40000);
if(BlastTrigger)
{
DoCast(BlastTrigger, SPELL_BLUE_BEAM);
@@ -941,7 +941,7 @@
m_creature->setEmoteState(EMOTE_STATE_NONE);
m_creature->InterruptSpell(CURRENT_GENERIC_SPELL);
Creature* Maiev = NULL;
- Maiev = m_creature->SummonCreature(CREATURE_MAIEV_SHADOWSONG, m_creature->GetPositionX() + 10, m_creature->GetPositionY() + 5, m_creature->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+ Maiev = m_creature->SummonCreature(CREATURE_MAIEV_SHADOWSONG, m_creature->GetPositionX() + 10, m_creature->GetPositionY() + 5, m_creature->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
if(Maiev)
{
m_creature->GetMotionMaster()->Clear(false);
@@ -973,7 +973,7 @@
}
}
// Since we killed Akama before, summon him now.
- Creature* Akama = DoSpawnCreature(22990, 10, 10, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 120000);
+ Creature* Akama = DoSpawnCreature(22990, 10.0f, 10.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 120000);
if(Akama)
{
((npc_akama_illidanAI*)Akama->AI())->RunAway = true; // Since we are resummoning him, his vars are at the default. That means he'll yell the Minions speech out. We have to avoid that like this
@@ -1012,7 +1012,7 @@
// It spawns multiple flames sometimes. Therefore, we'll do this manually.
// DoCast(m_creature->getVictim(), SPELL_FLAME_CRASH);
m_creature->HandleEmoteCommand(402);
- Creature* FlameCrash = DoSpawnCreature(23336, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 40000);
+ Creature* FlameCrash = DoSpawnCreature(23336, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 40000);
FlameCrashTimer = 35000;
GlobalTimer += 2000;
}else FlameCrashTimer -= diff;
@@ -1055,15 +1055,15 @@
Creature* Glaive2 = NULL;
// Summon Glaives.
- Glaive1 = m_creature->SummonCreature(CREATURE_BLADE_OF_AZZINOTH, X_GLAIVE1, Y_GLAIVE, Z_GLAIVE, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
- Glaive2 = m_creature->SummonCreature(CREATURE_BLADE_OF_AZZINOTH, X_GLAIVE2, Y_GLAIVE, Z_GLAIVE, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Glaive1 = m_creature->SummonCreature(CREATURE_BLADE_OF_AZZINOTH, X_GLAIVE1, Y_GLAIVE, Z_GLAIVE, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Glaive2 = m_creature->SummonCreature(CREATURE_BLADE_OF_AZZINOTH, X_GLAIVE2, Y_GLAIVE, Z_GLAIVE, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
// Summon Flames near the Glaives and have the Glaives channel a green beam on the flames
if(Glaive1)
{
GlaiveGUID[0] = Glaive1->GetGUID();
Glaive1->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
- Flame1 = m_creature->SummonCreature(22997, X_GLAIVE1-5, Y_GLAIVE, Z_GLAIVE, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 2000);
+ Flame1 = m_creature->SummonCreature(22997, X_GLAIVE1-5, Y_GLAIVE, Z_GLAIVE, 0.0f, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 2000);
if(Flame1)
{
Flame1->SetUInt32Value(OBJECT_FIELD_SCALE_X, 1073741824); // Make the Flame bigger
@@ -1079,7 +1079,6 @@
{
GlaiveGUID[1] = Glaive2->GetGUID();
Glaive2->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
- Flame2 = m_creature->SummonCreature(22997, X_GLAIVE2+5, Y_GLAIVE, Z_GLAIVE, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 2000);
if(Flame2)
{
Flame2->SetUInt32Value(OBJECT_FIELD_SCALE_X, 1073741824); // BIG Flame
@@ -1239,7 +1238,7 @@
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if(target && target->GetTypeId() == TYPEID_PLAYER) // only on players.
{
- ShadowDemon = DoSpawnCreature(CREATURE_SHADOW_DEMON, 0,0,0,0,TEMPSUMMON_CORPSE_DESPAWN,0);
+ ShadowDemon = DoSpawnCreature(CREATURE_SHADOW_DEMON, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
if(ShadowDemon)
{
ShadowDemon->AI()->AttackStart(target);
Index: scripts/zone/black_temple/boss_warlord_najentus.cpp
===================================================================
--- scripts/zone/black_temple/boss_warlord_najentus.cpp (revision 275)
+++ scripts/zone/black_temple/boss_warlord_najentus.cpp (working copy)
@@ -289,7 +289,7 @@
void DoImpalingSpineWorkaround(Unit* target)
{
Creature* Spine = NULL;
- Spine = m_creature->SummonCreature(500000, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 10000);
+ Spine = m_creature->SummonCreature(500000, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 10000);
if(Spine)
{
Spine->setFaction(m_creature->getFaction());
Index: scripts/zone/black_temple/boss_shade_of_akama.cpp
===================================================================
--- scripts/zone/black_temple/boss_shade_of_akama.cpp (revision 275)
+++ scripts/zone/black_temple/boss_shade_of_akama.cpp (working copy)
@@ -331,7 +331,7 @@
float Y = SpawnLocations[random].y;
if((rand()%15 == 0) && DeathCount > 0)
{
- Creature* Sorcerer = m_creature->SummonCreature(CREATURE_SORCERER, X, Y, Z_SPAWN, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+ Creature* Sorcerer = m_creature->SummonCreature(CREATURE_SORCERER, X, Y, Z_SPAWN, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
if(Sorcerer)
{
Sorcerer->AddThreat(m_creature, 100000000.0f);
@@ -349,7 +349,7 @@
}
else
{
- Creature* Spawn = m_creature->SummonCreature(entry, X, Y, Z_SPAWN, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000);
+ Creature* Spawn = m_creature->SummonCreature(entry, X, Y, Z_SPAWN, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000);
if(Spawn)
Spawn->AddThreat(SelectUnit(SELECT_TARGET_RANDOM, 0), 1.0f);
}
@@ -385,7 +385,7 @@
float x = ChannelerLocations[i].x;
float y = ChannelerLocations[i].y;
float o = ChannelerLocations[i].o;
- Channeler = m_creature->SummonCreature(CREATURE_CHANNELER, x, y, m_creature->GetPositionZ(), o, TEMPSUMMON_DEAD_DESPAWN, 1000);
+ Channeler = m_creature->SummonCreature(CREATURE_CHANNELER, x, y, m_creature->GetPositionZ(), o, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 1000);
if(Channeler)
{
Channeler->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
Index: scripts/zone/black_temple/boss_supremus.cpp
===================================================================
--- scripts/zone/black_temple/boss_supremus.cpp (revision 275)
+++ scripts/zone/black_temple/boss_supremus.cpp (working copy)
@@ -200,7 +200,7 @@
{
float X = CalculateRandomCoord();
float Y = CalculateRandomCoord();
- Creature* Target = DoSpawnCreature(24550, X, Y, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000);
+ Creature* Target = DoSpawnCreature(24550, X, Y, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000);
if(Target)
{
Target->SetVisibility(VISIBILITY_OFF);
@@ -348,16 +348,16 @@
switch(rand()%4)
{
case 0:
- Summon = m_creature->SummonCreature(entry, target->GetPositionX() + 20 + rand()%16, target->GetPositionY() + 20 + rand()%16, target->GetPositionZ(), rand()%7, TEMPSUMMON_TIMED_DESPAWN, 19000);
+ Summon = m_creature->SummonCreature(entry, target->GetPositionX() + 20 + rand()%16, target->GetPositionY() + 20 + rand()%16, target->GetPositionZ(), rand()%7, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 19000);
break;
case 1:
- Summon = m_creature->SummonCreature(entry, target->GetPositionX() - 20 - rand()%16, target->GetPositionY() + 20 + rand()%16, target->GetPositionZ(), rand()%7, TEMPSUMMON_TIMED_DESPAWN, 19000);
+ Summon = m_creature->SummonCreature(entry, target->GetPositionX() - 20 - rand()%16, target->GetPositionY() + 20 + rand()%16, target->GetPositionZ(), rand()%7, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 19000);
break;
case 2:
- Summon = m_creature->SummonCreature(entry, target->GetPositionX() + 20 + rand()%16, target->GetPositionY() - 20 - rand()%16, target->GetPositionZ(), rand()%7, TEMPSUMMON_TIMED_DESPAWN, 19000);
+ Summon = m_creature->SummonCreature(entry, target->GetPositionX() + 20 + rand()%16, target->GetPositionY() - 20 - rand()%16, target->GetPositionZ(), rand()%7, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 19000);
break;
case 3:
- Summon = m_creature->SummonCreature(entry, target->GetPositionX() - 20 - rand()%16, target->GetPositionY() - 20 - rand()%16, target->GetPositionZ(), rand()%7, TEMPSUMMON_TIMED_DESPAWN, 19000);
+ Summon = m_creature->SummonCreature(entry, target->GetPositionX() - 20 - rand()%16, target->GetPositionY() - 20 - rand()%16, target->GetPositionZ(), rand()%7, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 19000);
break;
}
if(Summon)
Index: scripts/zone/black_temple/boss_reliquary_of_souls.cpp
===================================================================
--- scripts/zone/black_temple/boss_reliquary_of_souls.cpp (revision 275)
+++ scripts/zone/black_temple/boss_reliquary_of_souls.cpp (working copy)
@@ -268,7 +268,7 @@
{
float x = Coords[SoulCount%7].x;
float y = Coords[SoulCount%7].y;
- Creature* Soul = m_creature->SummonCreature(23469, x, y, m_creature->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Creature* Soul = m_creature->SummonCreature(23469, x, y, m_creature->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
if (target && Soul)
{
@@ -321,7 +321,7 @@
{
m_creature->SetUInt32Value(UNIT_NPC_EMOTESTATE,373); // Ribs: open
Creature* EssenceSuffering = NULL;
- EssenceSuffering = m_creature->SummonCreature(23418, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 1.57, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+ EssenceSuffering = m_creature->SummonCreature(23418, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 1.57, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
if(EssenceSuffering)
{
@@ -418,7 +418,7 @@
{
m_creature->SetUInt32Value(UNIT_NPC_EMOTESTATE,373); // Ribs: open
Creature* EssenceDesire = NULL;
- EssenceDesire = m_creature->SummonCreature(23419, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 1.57, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+ EssenceDesire = m_creature->SummonCreature(23419, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 1.57, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
if(EssenceDesire)
{
@@ -519,7 +519,7 @@
{
m_creature->SetUInt32Value(UNIT_NPC_EMOTESTATE,373); // Ribs: open
Creature* EssenceAnger = NULL;
- EssenceAnger = m_creature->SummonCreature(23420, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 1.57, TEMPSUMMON_DEAD_DESPAWN, 0);
+ EssenceAnger = m_creature->SummonCreature(23420, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 1.57, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
if(EssenceAnger)
{
Index: scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp
===================================================================
--- scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp (revision 275)
+++ scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp (working copy)
@@ -711,7 +711,7 @@
Creature* Weapon;
for (uint32 i = 0; i < 7; i++)
{
- Weapon = m_creature->SummonCreature(KaelthasWeapons[i][0],KaelthasWeapons[i][1],KaelthasWeapons[i][2],KaelthasWeapons[i][3],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000);
+ Weapon = m_creature->SummonCreature(KaelthasWeapons[i][0], KaelthasWeapons[i][1], KaelthasWeapons[i][2], KaelthasWeapons[i][3], 0.0f, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000);
if (!Weapon)
error_log("Kael'thas weapon %i could not be spawned", i);
@@ -849,7 +849,7 @@
if(Phoenix_Timer < diff)
{
DoCast(m_creature, SPELL_PHOENIX_ANIMATION);
- Creature *Phoenix = DoSpawnCreature(PHOENIX, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 1000);
+ Creature *Phoenix = DoSpawnCreature(PHOENIX, 0.0f, 00.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 1000);
if(Phoenix)
{
Index: scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp
===================================================================
--- scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp (revision 275)
+++ scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp (working copy)
@@ -256,18 +256,18 @@
{
Phase = 3;
Creature *Solarian_Agent;
- Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS1_X, POS1_Y, POS1_Z, POS1_O, TEMPSUMMON_CORPSE_DESPAWN, 0);
- Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS1_X, POS1_Y, POS1_Z, POS1_O, TEMPSUMMON_CORPSE_DESPAWN, 0);
- Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS1_X, POS1_Y, POS1_Z, POS1_O, TEMPSUMMON_CORPSE_DESPAWN, 0);
- Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS1_X, POS1_Y, POS1_Z, POS1_O, TEMPSUMMON_CORPSE_DESPAWN, 0);
- Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS2_X, POS2_Y, POS2_Z, POS2_O, TEMPSUMMON_CORPSE_DESPAWN, 0);
- Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS2_X, POS2_Y, POS2_Z, POS2_O, TEMPSUMMON_CORPSE_DESPAWN, 0);
- Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS2_X, POS2_Y, POS2_Z, POS2_O, TEMPSUMMON_CORPSE_DESPAWN, 0);
- Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS2_X, POS2_Y, POS2_Z, POS2_O, TEMPSUMMON_CORPSE_DESPAWN, 0);
- Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS3_X, POS3_Y, POS3_Z, POS3_O, TEMPSUMMON_CORPSE_DESPAWN, 0);
- Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS3_X, POS3_Y, POS3_Z, POS3_O, TEMPSUMMON_CORPSE_DESPAWN, 0);
- Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS3_X, POS3_Y, POS3_Z, POS3_O, TEMPSUMMON_CORPSE_DESPAWN, 0);
- Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS3_X, POS3_Y, POS3_Z, POS3_O, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS1_X, POS1_Y, POS1_Z, POS1_O, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS1_X, POS1_Y, POS1_Z, POS1_O, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS1_X, POS1_Y, POS1_Z, POS1_O, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS1_X, POS1_Y, POS1_Z, POS1_O, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS2_X, POS2_Y, POS2_Z, POS2_O, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS2_X, POS2_Y, POS2_Z, POS2_O, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS2_X, POS2_Y, POS2_Z, POS2_O, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS2_X, POS2_Y, POS2_Z, POS2_O, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS3_X, POS3_Y, POS3_Z, POS3_O, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS3_X, POS3_Y, POS3_Z, POS3_O, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS3_X, POS3_Y, POS3_Z, POS3_O, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Solarian_Agent = m_creature->SummonCreature(SOLARIUM_AGENT, POS3_X, POS3_Y, POS3_Z, POS3_O, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
Phase2_Timer = 10000;
} else Phase2_Timer -= diff;
} else if(Phase == 3){
@@ -289,8 +289,8 @@
m_creature->SendMoveToPacket(POS1_X, POS1_Y, POS1_Z, false, 0);
Creature *Solarian_Priest;
- Solarian_Priest = m_creature->SummonCreature(SOLARIUM_PRIEST, POS2_X, POS2_Y, POS2_Z, POS2_O, TEMPSUMMON_CORPSE_DESPAWN, 0);
- Solarian_Priest = m_creature->SummonCreature(SOLARIUM_PRIEST, POS3_X, POS3_Y, POS3_Z, POS3_O, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Solarian_Priest = m_creature->SummonCreature(SOLARIUM_PRIEST, POS2_X, POS2_Y, POS2_Z, POS2_O, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Solarian_Priest = m_creature->SummonCreature(SOLARIUM_PRIEST, POS3_X, POS3_Y, POS3_Z, POS3_O, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
break;
@@ -299,8 +299,8 @@
m_creature->Relocate(POS2_X, POS2_Y, POS2_Z, POS2_O);
m_creature->SendMoveToPacket(POS2_X, POS2_Y, POS2_Z, false, 0);
- Solarian_Priest = m_creature->SummonCreature(SOLARIUM_PRIEST, POS1_X, POS1_Y, POS1_Z, POS1_O, TEMPSUMMON_CORPSE_DESPAWN, 0);
- Solarian_Priest = m_creature->SummonCreature(SOLARIUM_PRIEST, POS3_X, POS3_Y, POS3_Z, POS3_O, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Solarian_Priest = m_creature->SummonCreature(SOLARIUM_PRIEST, POS1_X, POS1_Y, POS1_Z, POS1_O, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Solarian_Priest = m_creature->SummonCreature(SOLARIUM_PRIEST, POS3_X, POS3_Y, POS3_Z, POS3_O, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
break;
@@ -309,8 +309,8 @@
m_creature->Relocate(POS3_X, POS3_Y, POS3_Z, POS3_O);
m_creature->SendMoveToPacket(POS3_X, POS3_Y, POS3_Z, false, 0);
- Solarian_Priest = m_creature->SummonCreature(SOLARIUM_PRIEST, POS1_X, POS1_Y, POS1_Z, POS1_O, TEMPSUMMON_CORPSE_DESPAWN, 0);
- Solarian_Priest = m_creature->SummonCreature(SOLARIUM_PRIEST, POS2_X, POS2_Y, POS2_Z, POS2_O, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Solarian_Priest = m_creature->SummonCreature(SOLARIUM_PRIEST, POS1_X, POS1_Y, POS1_Z, POS1_O, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Solarian_Priest = m_creature->SummonCreature(SOLARIUM_PRIEST, POS2_X, POS2_Y, POS2_Z, POS2_O, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
break;
}
Index: scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp
===================================================================
--- scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp (revision 275)
+++ scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp (working copy)
@@ -187,7 +187,7 @@
if (target)
{
Unit* Spawn = NULL;
- Spawn = m_creature->SummonCreature(CREATURE_ORB_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 3000);
+ Spawn = m_creature->SummonCreature(CREATURE_ORB_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 3000);
if (Spawn)
m_creature->CastSpell(Spawn, SPELL_ARCANE_ORB_TRIGGER, true);
}
Index: scripts/zone/tempest_keep/arcatraz/boss_zereketh_the_unbound.cpp
===================================================================
--- scripts/zone/tempest_keep/arcatraz/boss_zereketh_the_unbound.cpp (revision 275)
+++ scripts/zone/tempest_keep/arcatraz/boss_zereketh_the_unbound.cpp (working copy)
@@ -180,7 +180,7 @@
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0);
Unit* Summoned = NULL;
- Summoned = m_creature->SummonCreature(21101,target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,20000);
+ Summoned = m_creature->SummonCreature(21101, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 20000);
voidzone_timer = 15000;
Index: scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp
===================================================================
--- scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp (revision 275)
+++ scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp (working copy)
@@ -227,7 +227,7 @@
Unit* Spawned = NULL;
//Spawn claw tentacle on the random target
- Spawned = m_creature->SummonCreature(MOB_CLAW_TENTACLE,target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000);
+ Spawned = m_creature->SummonCreature(MOB_CLAW_TENTACLE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
if (Spawned)
Spawned->AddThreat(target,1.0f);
@@ -245,7 +245,7 @@
Unit* Spawned = NULL;
//1
- Spawned = m_creature->SummonCreature(MOB_EYE_TENTACLE,m_creature->GetPositionX()+10,m_creature->GetPositionY()-10,m_creature->GetPositionZ(),0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
+ Spawned = m_creature->SummonCreature(MOB_EYE_TENTACLE, m_creature->GetPositionX()+10, m_creature->GetPositionY()-10, m_creature->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 80000);
if (Spawned)
{
target = SelectUnit(SELECT_TARGET_RANDOM,0);
Index: scripts/zone/blackrock_spire/boss_gyth.cpp
===================================================================
--- scripts/zone/blackrock_spire/boss_gyth.cpp (revision 275)
+++ scripts/zone/blackrock_spire/boss_gyth.cpp (working copy)
@@ -126,7 +126,7 @@
void SummonCreatureWithRandomTarget(uint32 creatureId)
{
- Unit* Summoned = m_creature->SummonCreature(creatureId, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 240000);
+ Unit* Summoned = m_creature->SummonCreature(creatureId, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 240000);
if (Summoned)
{
Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
@@ -231,7 +231,7 @@
//Inturrupt any spell casting
m_creature->InterruptSpell(CURRENT_GENERIC_SPELL);
m_creature->SetUInt32Value(UNIT_FIELD_DISPLAYID, 9806); //Gyth model
- m_creature->SummonCreature(10429, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000);
+ m_creature->SummonCreature(10429, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000);
SummonedRend = true;
}
Index: scripts/zone/blackrock_spire/boss_halycon.cpp
===================================================================
--- scripts/zone/blackrock_spire/boss_halycon.cpp (revision 275)
+++ scripts/zone/blackrock_spire/boss_halycon.cpp (working copy)
@@ -118,7 +118,7 @@
if ( !Summoned && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 25 )
{
//Cast
- m_creature->SummonCreature(10268,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,300000);
+ m_creature->SummonCreature(10268, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 300000);
Summoned = true;
}
Index: scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp
===================================================================
--- scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp (revision 275)
+++ scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp (working copy)
@@ -154,9 +154,9 @@
target = SelectUnit(SELECT_TARGET_RANDOM,0);
//Cast
- SummonedCreature = m_creature->SummonCreature(9216,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,300000);
+ SummonedCreature = m_creature->SummonCreature(9216, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 300000);
((CreatureAI*)SummonedCreature->AI())->AttackStart(target);
- SummonedCreature = m_creature->SummonCreature(9268,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,300000);
+ SummonedCreature = m_creature->SummonCreature(9268, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 300000);
((CreatureAI*)SummonedCreature->AI())->AttackStart(target);
Summoned = true;
}
Index: scripts/zone/ragefire_chasm/instance_ragefire_chasm.cpp
===================================================================
--- scripts/zone/ragefire_chasm/instance_ragefire_chasm.cpp (revision 275)
+++ scripts/zone/ragefire_chasm/instance_ragefire_chasm.cpp (working copy)
@@ -125,7 +125,7 @@
case 1: RandY = 0 + Rand; break;
}
Rand = 0;
- Summoned = DoSpawnCreature(5676, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
+ Summoned = DoSpawnCreature(5676, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
if(Summoned)
((CreatureAI*)Summoned->AI())->AttackStart(victim);
}
Index: scripts/zone/blasted_lands/boss_kruul.cpp
===================================================================
--- scripts/zone/blasted_lands/boss_kruul.cpp (revision 275)
+++ scripts/zone/blasted_lands/boss_kruul.cpp (working copy)
@@ -121,7 +121,7 @@
case 1: RandY = 0 + Rand; break;
}
Rand = 0;
- Summoned = DoSpawnCreature(19207, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
+ Summoned = DoSpawnCreature(19207, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
if(Summoned)
((CreatureAI*)Summoned->AI())->AttackStart(victim);
}
Index: scripts/zone/blackwing_lair/npc_victor_nefarius.cpp
===================================================================
--- scripts/zone/blackwing_lair/npc_victor_nefarius.cpp (revision 275)
+++ scripts/zone/blackwing_lair/npc_victor_nefarius.cpp (working copy)
@@ -288,7 +288,7 @@
SpawnedAdds++;
//Spawn creature and force it to start attacking a random target
- Spawned = m_creature->SummonCreature(CreatureID,ADD_X1,ADD_Y1,ADD_Z1,5.000,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000);
+ Spawned = m_creature->SummonCreature(CreatureID, ADD_X1, ADD_Y1, ADD_Z1, 5.000, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (target && Spawned)
{
@@ -305,7 +305,7 @@
target = NULL;
Spawned = NULL;
- Spawned = m_creature->SummonCreature(CreatureID,ADD_X2,ADD_Y2,ADD_Z2,5.000,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000);
+ Spawned = m_creature->SummonCreature(CreatureID, ADD_X2, ADD_Y2, ADD_Z2, 5.000, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (target && Spawned)
{
@@ -335,7 +335,7 @@
//Spawn nef and have him attack a random target
Creature* Nefarian = NULL;
- Nefarian = m_creature->SummonCreature(CREATURE_NEFARIAN,NEF_X,NEF_Y,NEF_Z,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,120000);
+ Nefarian = m_creature->SummonCreature(CREATURE_NEFARIAN, NEF_X, NEF_Y, NEF_Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (target && Nefarian)
Index: scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
===================================================================
--- scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp (revision 275)
+++ scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp (working copy)
@@ -246,7 +246,7 @@
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0);
Creature* Summoned = NULL;
- Summoned = DoSpawnCreature(18431, 0,0,0,0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 21000);
+ Summoned = DoSpawnCreature(18431, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 21000);
if (Summoned && target)
Summoned->AI()->AttackStart(target);
@@ -336,7 +336,7 @@
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0);
Creature* Summoned = NULL;
- Summoned = DoSpawnCreature(18430, 0,0,0,0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 240000);
+ Summoned = DoSpawnCreature(18430, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 240000);
if (Summoned && target)
Summoned->AI()->AttackStart(target);
}else apprentice_timer -= diff;
Index: scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
===================================================================
--- scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp (revision 275)
+++ scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp (working copy)
@@ -105,7 +105,7 @@
{
DoYell(SAY_DEATH, LANG_UNIVERSAL, NULL);
DoPlaySoundToSet(m_creature,SOUND_DEATH);
- DoSpawnCreature(19412,0,0,0,0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); //When Exarch Maladar is defeated D'ore appear.
+ DoSpawnCreature(19412, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); //When Exarch Maladar is defeated D'ore appear.
}
void KilledUnit(Unit* victim)
Index: scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp
===================================================================
--- scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp (revision 275)
+++ scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp (working copy)
@@ -236,19 +236,19 @@
Creature* Summoned = NULL;
Unit* target = NULL;
- Summoned = DoSpawnCreature(19203,5,5,0,0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 240000);
+ Summoned = DoSpawnCreature(19203, 5.0f, 5.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 240000);
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (Summoned && target)
Summoned->AI()->AttackStart(target);
- Summoned = DoSpawnCreature(19205,-5,5,0,0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 240000);
+ Summoned = DoSpawnCreature(19205, -5.0f, 5.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 240000);
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (Summoned && target)
Summoned->AI()->AttackStart(target);
- Summoned = DoSpawnCreature(19204,-5,-5,0,0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 240000);
+ Summoned = DoSpawnCreature(19204, -5.0f, -5.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 240000);
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (Summoned && target)
Summoned->AI()->AttackStart(target);
- Summoned = DoSpawnCreature(19206, 5,-5,0,0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 240000);
+ Summoned = DoSpawnCreature(19206, 5.0f, -5.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 240000);
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (Summoned && target)
Summoned->AI()->AttackStart(target);
Index: scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp
===================================================================
--- scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp (revision 275)
+++ scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp (working copy)
@@ -96,9 +96,9 @@
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (target) // spawn a mushroom around random player
- pSummon = m_creature->SummonCreature(17990, target->GetPositionX()+(rand()%3), target->GetPositionY()+(rand()%3), target->GetPositionZ(), (rand()%5), TEMPSUMMON_TIMED_DESPAWN, 30000);
+ pSummon = m_creature->SummonCreature(17990, target->GetPositionX()+(rand()%3), target->GetPositionY()+(rand()%3), target->GetPositionZ(), (rand()%5), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 30000);
else // if player not found, spawn around boss
- pSummon = m_creature->SummonCreature(17990, m_creature->GetPositionX()+(rand()%8), m_creature->GetPositionY()+(rand()%8), m_creature->GetPositionZ(), (rand()%5), TEMPSUMMON_TIMED_DESPAWN, 30000);
+ pSummon = m_creature->SummonCreature(17990, m_creature->GetPositionX()+(rand()%8), m_creature->GetPositionY()+(rand()%8), m_creature->GetPositionZ(), (rand()%5), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 30000);
if (pSummon)
pSummon->setFaction(m_creature->getFaction());
Index: scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
===================================================================
--- scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp (revision 275)
+++ scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp (working copy)
@@ -244,7 +244,7 @@
if(!HasSpawnedInvisible)
if(Invisible_Timer < diff)
{
- Invisible = m_creature->SummonCreature(12999, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 999999);
+ Invisible = m_creature->SummonCreature(12999, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 999999);
if(Invisible)
{
@@ -330,10 +330,10 @@
// spawn 4 adds
Creature *Adds;
- Adds = DoSpawnCreature(ADDS_CLEAN, SPAWN_X_DIFF1, SPAWN_Y_DIFF1, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 999999);
- Adds = DoSpawnCreature(ADDS_CLEAN, SPAWN_X_DIFF2, SPAWN_Y_DIFF2, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 999999);
- Adds = DoSpawnCreature(ADDS_CLEAN, SPAWN_X_DIFF3, SPAWN_Y_DIFF3, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 999999);
- Adds = DoSpawnCreature(ADDS_CLEAN, SPAWN_X_DIFF4, SPAWN_Y_DIFF4, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 999999);
+ Adds = DoSpawnCreature(ADDS_CLEAN, SPAWN_X_DIFF1, SPAWN_Y_DIFF1, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 999999);
+ Adds = DoSpawnCreature(ADDS_CLEAN, SPAWN_X_DIFF2, SPAWN_Y_DIFF2, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 999999);
+ Adds = DoSpawnCreature(ADDS_CLEAN, SPAWN_X_DIFF3, SPAWN_Y_DIFF3, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 999999);
+ Adds = DoSpawnCreature(ADDS_CLEAN, SPAWN_X_DIFF4, SPAWN_Y_DIFF4, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 999999);
m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, IMMUNE_SCHOOL_FROST, true);
m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, IMMUNE_SCHOOL_NATURE, false); // disabled
@@ -409,10 +409,10 @@
// spawn 4 adds
Creature *Adds;
- Adds = DoSpawnCreature(ADDS_CORRUPT, SPAWN_X_DIFF1, SPAWN_Y_DIFF1, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 999999);
- Adds = DoSpawnCreature(ADDS_CORRUPT, SPAWN_X_DIFF2, SPAWN_Y_DIFF2, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 999999);
- Adds = DoSpawnCreature(ADDS_CORRUPT, SPAWN_X_DIFF3, SPAWN_Y_DIFF3, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 999999);
- Adds = DoSpawnCreature(ADDS_CORRUPT, SPAWN_X_DIFF4, SPAWN_Y_DIFF4, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 999999);
+ Adds = DoSpawnCreature(ADDS_CORRUPT, SPAWN_X_DIFF1, SPAWN_Y_DIFF1, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 999999);
+ Adds = DoSpawnCreature(ADDS_CORRUPT, SPAWN_X_DIFF2, SPAWN_Y_DIFF2, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 999999);
+ Adds = DoSpawnCreature(ADDS_CORRUPT, SPAWN_X_DIFF3, SPAWN_Y_DIFF3, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 999999);
+ Adds = DoSpawnCreature(ADDS_CORRUPT, SPAWN_X_DIFF4, SPAWN_Y_DIFF4, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 999999);
m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, IMMUNE_SCHOOL_FROST, false); // disabled
m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, IMMUNE_SCHOOL_NATURE, true);
Index: scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
===================================================================
--- scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp (revision 275)
+++ scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp (working copy)
@@ -266,7 +266,7 @@
{
//at this point he divides himself in two parts
Creature *Copy = NULL;
- Copy = DoSpawnCreature(DEMON_FORM, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+ Copy = DoSpawnCreature(DEMON_FORM, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
if(Copy)
{
Index: scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
===================================================================
--- scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp (revision 275)
+++ scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp (working copy)
@@ -396,7 +396,7 @@
Creature *pCreature;
for(uint8 i = 0; i < 4; i++)
{
- pCreature = m_creature->SummonCreature(SHIED_GENERATOR_CHANNEL, ShieldGeneratorChannelPos[i][0], ShieldGeneratorChannelPos[i][1], ShieldGeneratorChannelPos[i][2], ShieldGeneratorChannelPos[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0);
+ pCreature = m_creature->SummonCreature(SHIED_GENERATOR_CHANNEL, ShieldGeneratorChannelPos[i][0], ShieldGeneratorChannelPos[i][1], ShieldGeneratorChannelPos[i][2], ShieldGeneratorChannelPos[i][3], 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
if (pCreature)
ShieldGeneratorChannel[i] = pCreature->GetGUID();
}
@@ -412,7 +412,7 @@
if(SummonSporebat_Timer < diff)
{
Creature *Sporebat = NULL;
- Sporebat = m_creature->SummonCreature(FATHOM_SPOREBAT, SPOREBAT_X, SPOREBAT_Y, SPOREBAT_Z, SPOREBAT_O, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+ Sporebat = m_creature->SummonCreature(FATHOM_SPOREBAT, SPOREBAT_X, SPOREBAT_Y, SPOREBAT_Z, SPOREBAT_O, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
if(Sporebat)
{
@@ -479,7 +479,7 @@
if(EnchantedElemental_Timer < diff)
{
Creature *Elemental;
- Elemental = m_creature->SummonCreature(ENCHANTED_ELEMENTAL, ElementPos[EnchantedElemental_Pos][0], ElementPos[EnchantedElemental_Pos][1], ElementPos[EnchantedElemental_Pos][2], ElementPos[EnchantedElemental_Pos][3], TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Elemental = m_creature->SummonCreature(ENCHANTED_ELEMENTAL, ElementPos[EnchantedElemental_Pos][0], ElementPos[EnchantedElemental_Pos][1], ElementPos[EnchantedElemental_Pos][2], ElementPos[EnchantedElemental_Pos][3], 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
if(EnchantedElemental_Pos == 7)
EnchantedElemental_Pos = 0;
@@ -494,7 +494,7 @@
{
Creature *Tain_Elemental;
uint32 pos = rand()%8;
- Tain_Elemental = m_creature->SummonCreature(TAINTED_ELEMENTAL, ElementPos[pos][0], ElementPos[pos][1], ElementPos[pos][2], ElementPos[pos][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+ Tain_Elemental = m_creature->SummonCreature(TAINTED_ELEMENTAL, ElementPos[pos][0], ElementPos[pos][1], ElementPos[pos][2], ElementPos[pos][3], 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
TaintedElemental_Timer = 120000;
}else TaintedElemental_Timer -= diff;
@@ -504,7 +504,7 @@
{
Creature *CoilfangElite;
uint32 pos = rand()%3;
- CoilfangElite = m_creature->SummonCreature(COILFANG_ELITE, CoilfangElitePos[pos][0], CoilfangElitePos[pos][1], CoilfangElitePos[pos][2], CoilfangElitePos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+ CoilfangElite = m_creature->SummonCreature(COILFANG_ELITE, CoilfangElitePos[pos][0], CoilfangElitePos[pos][1], CoilfangElitePos[pos][2], CoilfangElitePos[pos][3], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
if(CoilfangElite)
{
Unit *target = NULL;
@@ -521,7 +521,7 @@
{
Creature *CoilfangStrider;
uint32 pos = rand()%3;
- CoilfangStrider = m_creature->SummonCreature(COILFANG_STRIDER, CoilfangStriderPos[pos][0], CoilfangStriderPos[pos][1], CoilfangStriderPos[pos][2], CoilfangStriderPos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+ CoilfangStrider = m_creature->SummonCreature(COILFANG_STRIDER, CoilfangStriderPos[pos][0], CoilfangStriderPos[pos][1], CoilfangStriderPos[pos][2], CoilfangStriderPos[pos][3], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
if(CoilfangStrider)
{
Unit *target = NULL;
Index: scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
===================================================================
--- scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp (revision 275)
+++ scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp (working copy)
@@ -224,7 +224,7 @@
}
}
if(needspawn)
- m_creature->SummonCreature(SEER_OLUM, OLUM_X, OLUM_Y, OLUM_Z, OLUM_O, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ m_creature->SummonCreature(SEER_OLUM, OLUM_X, OLUM_Y, OLUM_Z, OLUM_O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 180000);
}
}
Index: scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
===================================================================
--- scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp (revision 275)
+++ scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp (working copy)
@@ -231,7 +231,7 @@
{
Creature *Summoned;
- Summoned = m_creature->SummonCreature(Murloc_entries[rand()%6], x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+ Summoned = m_creature->SummonCreature(Murloc_entries[rand()%6], x, y, z, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
if(Summoned)
{
Unit *target = NULL;
@@ -245,7 +245,7 @@
{
Creature *Globule;
- Globule = m_creature->SummonCreature(WATER_GLOBULE, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN, 30000); //they despawn after 30 seconds
+ Globule = m_creature->SummonCreature(WATER_GLOBULE, x, y, z, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 30000); //they despawn after 30 seconds
if(Globule)
{
Unit *target = NULL;
Index: scripts/zone/onyxias_lair/boss_onyxia.cpp
===================================================================
--- scripts/zone/onyxias_lair/boss_onyxia.cpp (revision 275)
+++ scripts/zone/onyxias_lair/boss_onyxia.cpp (working copy)
@@ -282,29 +282,29 @@
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0);
- Summoned = m_creature->SummonCreature(11262,ADD_1X,ADD_1Y,ADD_1Z,0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000);
+ Summoned = m_creature->SummonCreature(11262, ADD_1X, ADD_1Y, ADD_1Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(11262,ADD_1X,ADD_1Y,ADD_1Z,0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000);
+ Summoned = m_creature->SummonCreature(11262, ADD_1X, ADD_1Y, ADD_1Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(11262,ADD_2X,ADD_2Y,ADD_2Z,0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000);
+ Summoned = m_creature->SummonCreature(11262, ADD_2X, ADD_2Y, ADD_2Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(11262,ADD_2X,ADD_2Y,ADD_2Z,0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000);
+ Summoned = m_creature->SummonCreature(11262, ADD_2X, ADD_2Y, ADD_2Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(11262,ADD_3X,ADD_3Y,ADD_3Z,0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000);
+ Summoned = m_creature->SummonCreature(11262, ADD_3X, ADD_3Y, ADD_3Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(11262,ADD_3X,ADD_3Y,ADD_3Z,0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000);
+ Summoned = m_creature->SummonCreature(11262, ADD_3X, ADD_3Y, ADD_3Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(11262,ADD_3X,ADD_3Y,ADD_3Z,0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000);
+ Summoned = m_creature->SummonCreature(11262, ADD_3X, ADD_3Y, ADD_3Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(11262,ADD_3X,ADD_3Y,ADD_3Z,0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000);
+ Summoned = m_creature->SummonCreature(11262, ADD_3X, ADD_3Y, ADD_3Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(11262,ADD_4X,ADD_4Y,ADD_4Z,0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000);
+ Summoned = m_creature->SummonCreature(11262, ADD_4X, ADD_4Y, ADD_4Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(11262,ADD_4X,ADD_4Y,ADD_4Z,0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000);
+ Summoned = m_creature->SummonCreature(11262, ADD_4X, ADD_4Y, ADD_4Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(11262,ADD_4X,ADD_4Y,ADD_4Z,0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000);
+ Summoned = m_creature->SummonCreature(11262, ADD_4X, ADD_4Y, ADD_4Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(11262,ADD_4X,ADD_4Y,ADD_4Z,0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000);
+ Summoned = m_creature->SummonCreature(11262, ADD_4X, ADD_4Y, ADD_4Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
Index: scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp
===================================================================
--- scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp (revision 275)
+++ scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp (working copy)
@@ -169,7 +169,7 @@
void UseRandomMovement()
{
- Creature* target = DoSpawnCreature(18104, rand()%25, rand()%25, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 15000);
+ Creature* target = DoSpawnCreature(18104, rand()%25, rand()%25, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 15000);
if(target)
{
((mob_doomfire_targettingAI*)target->AI())->IsWayPoint = true;
@@ -459,7 +459,7 @@
void SummonDoomfire(Unit* target)
{
- Creature* Doomfire = DoSpawnCreature(18095, rand()%10, rand()%10, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 30000);
+ Creature* Doomfire = DoSpawnCreature(18095, rand()%10, rand()%10, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 30000);
if(Doomfire)
{
Doomfire->setFaction(m_creature->getFaction());
@@ -484,7 +484,7 @@
{
if(DrainWorldTreeTimer < diff)
{
- Creature* ChannelTarget = m_creature->SummonCreature(22418, 5503.713, -3523.436, 1608.781, 0, TEMPSUMMON_TIMED_DESPAWN, 5000);
+ Creature* ChannelTarget = m_creature->SummonCreature(22418, 5503.713, -3523.436, 1608.781, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 5000);
if(ChannelTarget)
{
if(!HasStartedChanneling)
@@ -526,7 +526,7 @@
if(SummonWispTimer < diff)
{
- Creature* Wisp = DoSpawnCreature(17946, rand()%30, rand()%30, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+ Creature* Wisp = DoSpawnCreature(17946, rand()%30, rand()%30, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
if(Wisp)
{
Wisp->GetMotionMaster()->Mutate(new TargetedMovementGenerator<Creature>(*m_creature));
Index: scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp
===================================================================
--- scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp (revision 275)
+++ scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp (working copy)
@@ -112,7 +112,7 @@
Z = HordeBase[random].z;
}
- Creature* pCreature = m_creature->SummonCreature(entry, X, Y, Z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
+ Creature* pCreature = m_creature->SummonCreature(entry, X, Y, Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
if(pCreature)
{
if(PlayerGUID)
Index: scripts/zone/nagrand/mobs_nagrand.cpp
===================================================================
--- scripts/zone/nagrand/mobs_nagrand.cpp (revision 275)
+++ scripts/zone/nagrand/mobs_nagrand.cpp (working copy)
@@ -94,9 +94,9 @@
float y = m_creature->GetPositionY();
float z = m_creature->GetPositionZ();
- Hitter->SummonCreature(18181,x+(0.7 * (rand()%30)),y+(rand()%5),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000);
- Hitter->SummonCreature(18181,x+(rand()%5),y-(rand()%5),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000);
- Hitter->SummonCreature(18181,x-(rand()%5),y+(0.5 *(rand()%60)),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000);
+ Hitter->SummonCreature(18181, x+(0.7 * (rand()%30)), y+(rand()%5), z, 0.0f, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000);
+ Hitter->SummonCreature(18181, x+(rand()%5), y-(rand()%5), z, 0.0f, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000);
+ Hitter->SummonCreature(18181, x-(rand()%5), y+(0.5 *(rand()%60)), z, 0.0f, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000);
m_creature->setDeathState(CORPSE);
Spawn = true;
}
Index: scripts/zone/wailing_caverns/instance_wailing_caverns.cpp
===================================================================
--- scripts/zone/wailing_caverns/instance_wailing_caverns.cpp (revision 275)
+++ scripts/zone/wailing_caverns/instance_wailing_caverns.cpp (working copy)
@@ -133,9 +133,9 @@
case 1: RandY = 0 + 0.3; break;
}
if(m_creature->GetEntry() == 5780)
- Summoned = DoSpawnCreature(5780, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000);
+ Summoned = DoSpawnCreature(5780, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000);
if(m_creature->GetEntry() == 3640)
- Summoned = DoSpawnCreature(3640, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000);
+ Summoned = DoSpawnCreature(3640, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000);
if(Summoned)
{
((CreatureAI*)Summoned->AI())->AttackStart(victim);
@@ -160,7 +160,7 @@
case 0: RandY = 0 - 10 - Rand; break;
case 1: RandY = 0 + 10 + Rand; break;
}
- Summoned = DoSpawnCreature(3840, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000);
+ Summoned = DoSpawnCreature(3840, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000);
if(Summoned)
((CreatureAI*)Summoned->AI())->AttackStart(victim);
}
@@ -181,7 +181,7 @@
case 0: RandY = 0 - 10 - Rand; break;
case 1: RandY = 0 + 10 + Rand; break;
}
- Summoned = DoSpawnCreature(3636, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000);
+ Summoned = DoSpawnCreature(3636, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000);
if(Summoned)
((CreatureAI*)Summoned->AI())->AttackStart(victim);
}
@@ -621,7 +621,7 @@
case 0: RandY = 0 - Rand; break;
case 1: RandY = 0 + Rand; break;
}
- Summoned = DoSpawnCreature(8886, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000);
+ Summoned = DoSpawnCreature(8886, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000);
if(Summoned)
((CreatureAI*)Summoned->AI())->AttackStart(victim);
}
Index: scripts/zone/eastern_plaguelands/mobs_ghoul_flayer.cpp
===================================================================
--- scripts/zone/eastern_plaguelands/mobs_ghoul_flayer.cpp (revision 275)
+++ scripts/zone/eastern_plaguelands/mobs_ghoul_flayer.cpp (working copy)
@@ -93,7 +93,7 @@
case 1: RandY = 0 + Rand; break;
}
Rand = 0;
- DoSpawnCreature(11064, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000);
+ DoSpawnCreature(11064, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000);
}
};
CreatureAI* GetAI_mobs_ghoul_flayer(Creature *_Creature)
Index: scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp
===================================================================
--- scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp (revision 275)
+++ scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp (working copy)
@@ -390,7 +390,7 @@
if(Summon_Timer < diff)
{
Creature *Add = NULL;
- Add = DoSpawnCreature(18847, DoCalculateRandomLocation(), DoCalculateRandomLocation(), 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+ Add = DoSpawnCreature(18847, DoCalculateRandomLocation(), DoCalculateRandomLocation(), 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
Summon_Timer = 30000;
}else Summon_Timer -= diff;
Index: scripts/zone/deadmines/instance_deadmines.cpp
===================================================================
--- scripts/zone/deadmines/instance_deadmines.cpp (revision 275)
+++ scripts/zone/deadmines/instance_deadmines.cpp (working copy)
@@ -160,11 +160,11 @@
}
Rand = 0;
if(m_creature->GetEntry() == 1731)
- Summoned = DoSpawnCreature(2520, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000);
+ Summoned = DoSpawnCreature(2520, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000);
if(m_creature->GetEntry() == 1732)
- Summoned = DoSpawnCreature(3450, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000);
+ Summoned = DoSpawnCreature(3450, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000);
if(m_creature->GetEntry() == 619)
- Summoned = DoSpawnCreature(3417, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
+ Summoned = DoSpawnCreature(3417, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
if(Summoned)
((CreatureAI*)Summoned->AI())->AttackStart(victim);
}
Index: scripts/zone/karazhan/boss_shade_of_aran.cpp
===================================================================
--- scripts/zone/karazhan/boss_shade_of_aran.cpp (revision 275)
+++ scripts/zone/karazhan/boss_shade_of_aran.cpp (working copy)
@@ -520,7 +520,7 @@
}
Unit* Spawn = NULL;
- Spawn = m_creature->SummonCreature(CREATURE_ARAN_BLIZZARD, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 25000);
+ Spawn = m_creature->SummonCreature(CREATURE_ARAN_BLIZZARD, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 25000);
if (Spawn)
{
Spawn->setFaction(m_creature->getFaction());
@@ -538,7 +538,7 @@
for (uint32 i = 0; i < 4; i++)
{
- Creature* pUnit = DoSpawnCreature(CREATURE_WATER_ELEMENTAL, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 90000);
+ Creature* pUnit = DoSpawnCreature(CREATURE_WATER_ELEMENTAL, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 90000);
if (pUnit)
{
pUnit->Attack(m_creature->getVictim());
@@ -554,7 +554,7 @@
{
for (uint32 i = 0; i < 5; i++)
{
- Creature* pUnit = DoSpawnCreature(CREATURE_SHADOW_OF_ARAN, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+ Creature* pUnit = DoSpawnCreature(CREATURE_SHADOW_OF_ARAN, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
if (pUnit)
{
pUnit->Attack(m_creature->getVictim());
Index: scripts/zone/karazhan/boss_terestian_illhoof.cpp
===================================================================
--- scripts/zone/karazhan/boss_terestian_illhoof.cpp (revision 275)
+++ scripts/zone/karazhan/boss_terestian_illhoof.cpp (working copy)
@@ -149,7 +149,7 @@
if (SpawnKilrek_Timer < diff)
{
float A = m_creature->GetAngle(m_creature);
- Creature* Kilrek = m_creature->SummonCreature(17229, m_creature->GetPositionX(), m_creature->GetPositionY()+10, m_creature->GetPositionZ(), A, TEMPSUMMON_CORPSE_DESPAWN, 10000);
+ Creature* Kilrek = m_creature->SummonCreature(17229, m_creature->GetPositionX(), m_creature->GetPositionY()+10, m_creature->GetPositionZ(), A, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 10000);
Kilrek->setFaction(m_creature->getFaction());
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM, 0);
@@ -169,7 +169,7 @@
DoPlaySoundToSet(m_creature, SOUND_SPAWN1);
}
float A = m_creature->GetAngle(m_creature);
- Creature* Homunculus = m_creature->SummonCreature(16539, m_creature->GetPositionX()+(rand()%15), m_creature->GetPositionY()+(rand()%15), m_creature->GetPositionZ(), A, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000);
+ Creature* Homunculus = m_creature->SummonCreature(16539, m_creature->GetPositionX()+(rand()%15), m_creature->GetPositionY()+(rand()%15), m_creature->GetPositionZ(), A, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000);
Homunculus->setFaction(m_creature->getFaction());
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM, 0);
Index: scripts/zone/karazhan/boss_curator.cpp
===================================================================
--- scripts/zone/karazhan/boss_curator.cpp (revision 275)
+++ scripts/zone/karazhan/boss_curator.cpp (working copy)
@@ -179,7 +179,7 @@
if(AddTimer < diff)
{
//Summon Astral Flare
- Creature* AstralFlare = DoSpawnCreature(17096, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+ Creature* AstralFlare = DoSpawnCreature(17096, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM, 0);
Index: scripts/zone/karazhan/boss_midnight.cpp
===================================================================
--- scripts/zone/karazhan/boss_midnight.cpp (revision 275)
+++ scripts/zone/karazhan/boss_midnight.cpp (working copy)
@@ -109,7 +109,7 @@
if(Phase == 1 && (m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 95)
{
Phase = 2;
- Creature *pAttumen = DoSpawnCreature(SUMMON_ATTUMEN, 0, 0, 0, 0, TEMPSUMMON_DEAD_DESPAWN, 500000);
+ Creature *pAttumen = DoSpawnCreature(SUMMON_ATTUMEN, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 500000);
if(pAttumen)
{
Attumen = pAttumen->GetGUID();
Index: scripts/zone/karazhan/boss_prince_malchezaar.cpp
===================================================================
--- scripts/zone/karazhan/boss_prince_malchezaar.cpp (revision 275)
+++ scripts/zone/karazhan/boss_prince_malchezaar.cpp (working copy)
@@ -451,7 +451,7 @@
}
- Creature *Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, posX, posY, posZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Creature *Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, posX, posY, posZ, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 180000);
if (Infernal)
{
@@ -558,7 +558,7 @@
Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0);
for(uint32 i=0; i<2; ++i)
{
- Creature *axe = m_creature->SummonCreature(MALCHEZARS_AXE, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000);
+ Creature *axe = m_creature->SummonCreature(MALCHEZARS_AXE, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0.0, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000);
if(axe)
{
axe->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_DISPLAY, AXE_EQUIP_MODEL);
Index: scripts/zone/dustwallow_marsh/npcs_dustwallow_marsh.cpp
===================================================================
--- scripts/zone/dustwallow_marsh/npcs_dustwallow_marsh.cpp (revision 275)
+++ scripts/zone/dustwallow_marsh/npcs_dustwallow_marsh.cpp (working copy)
@@ -25,6 +25,7 @@
#include "../../../../../game/Player.h"
#include "../../../../../game/QuestDef.h"
#include "../../../../../game/GossipDef.h"
+#include "../../../../../game/RandomMovementGenerator.h"
/*######
## npc_deserter_agitator
@@ -376,7 +377,7 @@
float Y = AllianceCoords[randLoc].y;
float Z = AllianceCoords[randLoc].z;
float O = AllianceCoords[randLoc].o;
- Patient = m_creature->SummonCreature(randId, X, Y, Z, O, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+ Patient = m_creature->SummonCreature(randId, X, Y, Z, O, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
}
else if(docEntry == 12920) //Horde doc entry
{
@@ -385,7 +386,7 @@
float Y = HordeCoords[randLoc].y;
float Z = HordeCoords[randLoc].z;
float O = HordeCoords[randLoc].o;
- Patient = m_creature->SummonCreature(randId, X, Y, Z, O, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+ Patient = m_creature->SummonCreature(randId, X, Y, Z, O, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
}
if(Patient)
((npc_injured_patientAI*)Patient->AI())->Doctorguid = m_creature->GetGUID();
Index: scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp
===================================================================
--- scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp (revision 275)
+++ scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp (working copy)
@@ -125,7 +125,7 @@
case 1: RandY = 0 + Rand; break;
}
Rand = 0;
- Summoned = DoSpawnCreature(8585, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
+ Summoned = DoSpawnCreature(8585, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
if(Summoned)
((CreatureAI*)Summoned->AI())->AttackStart(victim);
}
Index: scripts/zone/blackrock_depths/boss_general_angerforge.cpp
===================================================================
--- scripts/zone/blackrock_depths/boss_general_angerforge.cpp (revision 275)
+++ scripts/zone/blackrock_depths/boss_general_angerforge.cpp (working copy)
@@ -112,7 +112,7 @@
case 1: Rand1Y = 0 + Rand1; break;
}
Rand1 = 0;
- SummonedAdds = DoSpawnCreature(8901, Rand1X, Rand1Y, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000);
+ SummonedAdds = DoSpawnCreature(8901, Rand1X, Rand1Y, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000);
if(SummonedAdds)
((CreatureAI*)SummonedAdds->AI())->AttackStart(victim);
}
@@ -133,7 +133,7 @@
case 1: Rand2Y = 0 + Rand2; break;
}
Rand2 = 0;
- SummonedMedics = DoSpawnCreature(8894, Rand2X, Rand2Y, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000);
+ SummonedMedics = DoSpawnCreature(8894, Rand2X, Rand2Y, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000);
if(SummonedMedics)
((CreatureAI*)SummonedMedics->AI())->AttackStart(victim);
}
Index: scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp
===================================================================
--- scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp (revision 275)
+++ scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp (working copy)
@@ -100,7 +100,7 @@
case 1: RandY = 0 + Rand; break;
}
Rand = 0;
- Summoned = DoSpawnCreature(9178, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
+ Summoned = DoSpawnCreature(9178, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
if(Summoned)
((CreatureAI*)Summoned->AI())->AttackStart(victim);
}
Index: scripts/zone/blackrock_depths/boss_doomrel.cpp
===================================================================
--- scripts/zone/blackrock_depths/boss_doomrel.cpp (revision 275)
+++ scripts/zone/blackrock_depths/boss_doomrel.cpp (working copy)
@@ -110,7 +110,7 @@
case 1: RandY = 0 + Rand; break;
}
Rand = 0;
- Summoned = DoSpawnCreature(16119, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000);
+ Summoned = DoSpawnCreature(16119, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000);
if(Summoned)
((CreatureAI*)Summoned->AI())->AttackStart(victim);
}
Index: scripts/zone/terokkar_forest/mobs_terokkar_forest.cpp
===================================================================
--- scripts/zone/terokkar_forest/mobs_terokkar_forest.cpp (revision 275)
+++ scripts/zone/terokkar_forest/mobs_terokkar_forest.cpp (working copy)
@@ -241,7 +241,7 @@
case 1: RandY = 0 + Rand; break;
}
Rand = 0;
- DoSpawnCreature(netherwebVictims[rand()%6], RandX, RandY, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
+ DoSpawnCreature(netherwebVictims[rand()%6], RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
}
void JustDied(Unit* Killer)
@@ -253,7 +253,7 @@
{
if (rand()%100 < 25)
{
- DoSpawnCreature(22459, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
+ DoSpawnCreature(22459, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
((Player*)Killer)->KilledMonster(22459, m_creature->GetGUID());
}
SummonVictims(m_creature->getVictim());
Index: scripts/zone/molten_core/boss_garr.cpp
===================================================================
--- scripts/zone/molten_core/boss_garr.cpp (revision 275)
+++ scripts/zone/molten_core/boss_garr.cpp (working copy)
@@ -113,7 +113,7 @@
for (int32 i = 0; i < 8; i++)
{
Unit* pUnit = NULL;
- pUnit = DoSpawnCreature(12099, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 1000);
+ pUnit = DoSpawnCreature(12099, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 1000);
if (pUnit)
Add[i] = pUnit->GetGUID();
Index: scripts/zone/molten_core/boss_ragnaros.cpp
===================================================================
--- scripts/zone/molten_core/boss_ragnaros.cpp (revision 275)
+++ scripts/zone/molten_core/boss_ragnaros.cpp (working copy)
@@ -334,7 +334,7 @@
for(int i = 0; i < 9;i++)
{
target = SelectUnit(SELECT_TARGET_RANDOM,0);
- Summoned = m_creature->SummonCreature(12143,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000);
+ Summoned = m_creature->SummonCreature(12143, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
}
@@ -353,7 +353,7 @@
for(int i = 0; i < 9;i++)
{
target = SelectUnit(SELECT_TARGET_RANDOM,0);
- Summoned = m_creature->SummonCreature(12143,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000);
+ Summoned = m_creature->SummonCreature(12143, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
}
Index: scripts/zone/zulaman/boss_janalai.cpp
===================================================================
--- scripts/zone/zulaman/boss_janalai.cpp (revision 275)
+++ scripts/zone/zulaman/boss_janalai.cpp (working copy)
@@ -259,30 +259,30 @@
void FireWall() // Create Firewall
{
Unit* wall = NULL;
- wall = m_creature->SummonCreature(MOB_FIRE_BOMB,FireWallCoords[0][0],FireWallCoords[0][1],FireWallCoords[0][2],FireWallCoords[0][3],TEMPSUMMON_TIMED_DESPAWN,11500);
+ wall = m_creature->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[0][0], FireWallCoords[0][1], FireWallCoords[0][2], FireWallCoords[0][3], 0.0f, TEMPSUMMON_TIMED_DESPAWN, 11500);
wall->CastSpell(wall,SPELL_FIRE_WALL,false);
- wall = m_creature->SummonCreature(MOB_FIRE_BOMB,FireWallCoords[0][0],FireWallCoords[0][1]+5,FireWallCoords[0][2],FireWallCoords[0][3],TEMPSUMMON_TIMED_DESPAWN,11500);
+ wall = m_creature->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[0][0], FireWallCoords[0][1]+5, FireWallCoords[0][2], FireWallCoords[0][3], 0.0f, TEMPSUMMON_TIMED_DESPAWN, 11500);
wall->CastSpell(wall,SPELL_FIRE_WALL,false);
- wall = m_creature->SummonCreature(MOB_FIRE_BOMB,FireWallCoords[0][0],FireWallCoords[0][1]-5,FireWallCoords[0][2],FireWallCoords[0][3],TEMPSUMMON_TIMED_DESPAWN,11500);
+ wall = m_creature->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[0][0], FireWallCoords[0][1]-5, FireWallCoords[0][2], FireWallCoords[0][3], 0.0f, TEMPSUMMON_TIMED_DESPAWN, 11500);
wall->CastSpell(wall,SPELL_FIRE_WALL,false);
- wall = m_creature->SummonCreature(MOB_FIRE_BOMB,FireWallCoords[1][0]-2,FireWallCoords[1][1]-2,FireWallCoords[1][2],FireWallCoords[1][3],TEMPSUMMON_TIMED_DESPAWN,11500);
+ wall = m_creature->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[1][0]-2, FireWallCoords[1][1]-2, FireWallCoords[1][2], FireWallCoords[1][3], 0.0f, TEMPSUMMON_TIMED_DESPAWN, 11500);
wall->CastSpell(wall,SPELL_FIRE_WALL,false);
- wall = m_creature->SummonCreature(MOB_FIRE_BOMB,FireWallCoords[1][0]+2,FireWallCoords[1][1]+2,FireWallCoords[1][2],FireWallCoords[1][3],TEMPSUMMON_TIMED_DESPAWN,11500);
+ wall = m_creature->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[1][0]+2, FireWallCoords[1][1]+2, FireWallCoords[1][2], FireWallCoords[1][3], 0.0f, TEMPSUMMON_TIMED_DESPAWN, 11500);
wall->CastSpell(wall,SPELL_FIRE_WALL,false);
- wall = m_creature->SummonCreature(MOB_FIRE_BOMB,FireWallCoords[2][0],FireWallCoords[2][1],FireWallCoords[2][2],FireWallCoords[2][3],TEMPSUMMON_TIMED_DESPAWN,11500);
+ wall = m_creature->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[2][0], FireWallCoords[2][1], FireWallCoords[2][2], FireWallCoords[2][3], 0.0f, TEMPSUMMON_TIMED_DESPAWN, 11500);
wall->CastSpell(wall,SPELL_FIRE_WALL,false);
- wall = m_creature->SummonCreature(MOB_FIRE_BOMB,FireWallCoords[2][0],FireWallCoords[2][1]-5,FireWallCoords[2][2],FireWallCoords[2][3],TEMPSUMMON_TIMED_DESPAWN,11500);
+ wall = m_creature->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[2][0], FireWallCoords[2][1]-5, FireWallCoords[2][2], FireWallCoords[2][3], 0.0f, TEMPSUMMON_TIMED_DESPAWN, 11500);
wall->CastSpell(wall,SPELL_FIRE_WALL,false);
- wall = m_creature->SummonCreature(MOB_FIRE_BOMB,FireWallCoords[2][0],FireWallCoords[2][1]+5,FireWallCoords[2][2],FireWallCoords[2][3],TEMPSUMMON_TIMED_DESPAWN,11500);
+ wall = m_creature->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[2][0], FireWallCoords[2][1]+5, FireWallCoords[2][2], FireWallCoords[2][3], 0.0f, TEMPSUMMON_TIMED_DESPAWN, 11500);
wall->CastSpell(wall,SPELL_FIRE_WALL,false);
- wall = m_creature->SummonCreature(MOB_FIRE_BOMB,FireWallCoords[3][0]-2,FireWallCoords[3][1],FireWallCoords[3][2],FireWallCoords[3][3],TEMPSUMMON_TIMED_DESPAWN,11500);
+ wall = m_creature->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[3][0]-2, FireWallCoords[3][1], FireWallCoords[3][2], FireWallCoords[3][3], 0.0f, TEMPSUMMON_TIMED_DESPAWN, 11500);
wall->CastSpell(wall,SPELL_FIRE_WALL,false);
- wall = m_creature->SummonCreature(MOB_FIRE_BOMB,FireWallCoords[3][0]+2,FireWallCoords[3][1],FireWallCoords[3][2],FireWallCoords[3][3],TEMPSUMMON_TIMED_DESPAWN,11500);
+ wall = m_creature->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[3][0]+2, FireWallCoords[3][1], FireWallCoords[3][2], FireWallCoords[3][3], 0.0f, TEMPSUMMON_TIMED_DESPAWN, 11500);
wall->CastSpell(wall,SPELL_FIRE_WALL,false);
}
@@ -295,10 +295,10 @@
dx = (rand()%(area_dx))-(area_dx/2);
dy = (rand()%(area_dy))-(area_dy/2);
- firebombs[i] = DoSpawnCreature(MOB_FIRE_BOMB,dx,dy,0,0,TEMPSUMMON_TIMED_DESPAWN,13000);
+ firebombs[i] = DoSpawnCreature(MOB_FIRE_BOMB, dx, dy, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN,13000);
};
- throwcontroler = DoSpawnCreature(MOB_FIRE_BOMB,0,0,1,0,TEMPSUMMON_TIMED_DESPAWN,10000);
+ throwcontroler = DoSpawnCreature(MOB_FIRE_BOMB, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN,10000);
bombcounter = 0;
}
@@ -385,9 +385,9 @@
Unit* hatcher = NULL;
DoYell(SAY_SUMMON_HATCHER, LANG_UNIVERSAL, NULL);
DoPlaySoundToSet(m_creature,SOUND_SUMMON_HATCHER);
- hatcher = m_creature->SummonCreature(MOB_AMANI_HATCHER,hatcherway_l[0][0],hatcherway_l[0][1],hatcherway_l[0][2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,10000);
+ hatcher = m_creature->SummonCreature(MOB_AMANI_HATCHER, hatcherway_l[0][0], hatcherway_l[0][1], hatcherway_l[0][2], 0.0f, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
hatcher->Relocate(hatcherway_l[0][0],hatcherway_l[0][1],hatcherway_l[0][2]);
- hatcher = m_creature->SummonCreature(MOB_AMANI_HATCHER,hatcherway_r[0][0],hatcherway_r[0][1],hatcherway_r[0][2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,10000);
+ hatcher = m_creature->SummonCreature(MOB_AMANI_HATCHER, hatcherway_r[0][0], hatcherway_r[0][1], hatcherway_r[0][2], 0.0f, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
hatcher->Relocate(hatcherway_r[0][0],hatcherway_r[0][1],hatcherway_r[0][2]);
hatchertime = 45000;
}
@@ -432,7 +432,7 @@
{
int r = (rand()%20 - 10);
int s = (rand()%20 - 10);
- m_creature->SummonCreature(MOB_HATCHLING,JanalainPos[0][0]+s,JanalainPos[0][1]+r,JanalainPos[0][2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,15000);
+ m_creature->SummonCreature(MOB_HATCHLING, JanalainPos[0][0]+s, JanalainPos[0][1]+r, JanalainPos[0][2], 0.0f, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000);
pInstance->SetData(DATA_J_HATCHLEFT,1);
};
@@ -442,7 +442,7 @@
{
int r = (rand()%20 - 10);
int s = (rand()%20 - 10);
- m_creature->SummonCreature(MOB_HATCHLING,JanalainPos[0][0]+s,JanalainPos[0][1]+r,JanalainPos[0][2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,15000);
+ m_creature->SummonCreature(MOB_HATCHLING, JanalainPos[0][0]+s, JanalainPos[0][1]+r, JanalainPos[0][2], 0.0f, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000);
pInstance->SetData(DATA_J_HATCHRIGHT,1);
};
noeggs = true;
@@ -616,7 +616,7 @@
}
else
{
- hatchling = DoSpawnCreature(MOB_HATCHLING,rand()%4-2,rand()%4-2,0,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,15000);
+ hatchling = DoSpawnCreature(MOB_HATCHLING, rand()%4-2, rand()%4-2, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000);
pInstance->SetData(DATA_J_HATCHLEFT,1);
};
};
@@ -644,7 +644,7 @@
}
else
{
- hatchling = DoSpawnCreature(MOB_HATCHLING,rand()%4-2,rand()%4-2,0,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,15000);
+ hatchling = DoSpawnCreature(MOB_HATCHLING, rand()%4-2, rand()%4-2, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN,15000);
pInstance->SetData(DATA_J_HATCHRIGHT,1);
};
};
Index: scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp
===================================================================
--- scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp (revision 275)
+++ scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp (working copy)
@@ -139,14 +139,14 @@
void JustDied(Unit* Victim)
{
- m_creature->SummonCreature(10698,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(10698,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(10698,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(10698,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(10698,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(10698,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(10698,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(10698,ADD_8X,ADD_8Y,ADD_8Z,ADD_8O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(10698, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(10698, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(10698, ADD_3X, ADD_3Y, ADD_3Z, ADD_3O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(10698, ADD_4X, ADD_4Y, ADD_4Z, ADD_4O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(10698, ADD_5X, ADD_5Y, ADD_5Z, ADD_5O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(10698, ADD_6X, ADD_6Y, ADD_6Z, ADD_6O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(10698, ADD_7X, ADD_7Y, ADD_7Z, ADD_7O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(10698, ADD_8X, ADD_8Y, ADD_8Z, ADD_8O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
}
void AttackStart(Unit *who)
Index: scripts/zone/stratholme/boss_cannon_master_willey.cpp
===================================================================
--- scripts/zone/stratholme/boss_cannon_master_willey.cpp (revision 275)
+++ scripts/zone/stratholme/boss_cannon_master_willey.cpp (working copy)
@@ -101,13 +101,13 @@
void JustDied(Unit* Victim)
{
- m_creature->SummonCreature(11054,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_3X, ADD_3Y, ADD_3Z, ADD_3O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_4X, ADD_4Y, ADD_4Z, ADD_4O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_5X, ADD_5Y, ADD_5Z, ADD_5O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_7X, ADD_7Y, ADD_7Z, ADD_7O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_9X, ADD_9Y, ADD_9Z, ADD_9O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
}
void AttackStart(Unit *who)
@@ -188,49 +188,49 @@
switch (rand()%9)
{
case 0:
- m_creature->SummonCreature(11054,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, 0.0f, TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054, ADD_4X, ADD_4Y, ADD_4Z, ADD_4O, 0.0f, TEMPSUMMON_TIMED_DESPAWN,240000);
break;
case 1:
- m_creature->SummonCreature(11054,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_3X, ADD_3Y, ADD_3Z, ADD_3O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_5X, ADD_5Y, ADD_5Z, ADD_5O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
break;
case 2:
- m_creature->SummonCreature(11054,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054, ADD_3X, ADD_3Y, ADD_3Z, ADD_3O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_4X, ADD_4Y, ADD_4Z, ADD_4O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_6X, ADD_6Y, ADD_6Z, ADD_6O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
break;
case 3:
- m_creature->SummonCreature(11054,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054, ADD_4X, ADD_4Y, ADD_4Z, ADD_4O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_5X, ADD_5Y, ADD_5Z, ADD_5O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_7X, ADD_7Y, ADD_7Z, ADD_7O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
break;
case 4:
- m_creature->SummonCreature(11054,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_8X,ADD_8Y,ADD_8Z,ADD_8O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054, ADD_5X, ADD_5Y, ADD_5Z, ADD_5O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_6X, ADD_6Y, ADD_6Z, ADD_6O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_8X, ADD_8Y, ADD_8Z, ADD_8O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
break;
case 5:
- m_creature->SummonCreature(11054,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054, ADD_6X, ADD_6Y, ADD_6Z, ADD_6O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_7X, ADD_7Y, ADD_7Z, ADD_7O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_9X, ADD_9Y, ADD_9Z, ADD_9O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
break;
case 6:
- m_creature->SummonCreature(11054,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_8X,ADD_8Y,ADD_8Z,ADD_8O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054, ADD_7X, ADD_7Y, ADD_7Z, ADD_7O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_8X, ADD_8Y, ADD_8Z, ADD_8O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
break;
case 7:
- m_creature->SummonCreature(11054,ADD_8X,ADD_8Y,ADD_8Z,ADD_8O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054, ADD_8X, ADD_8Y, ADD_8Z, ADD_8O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_9X, ADD_9Y, ADD_9Z, ADD_9O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
break;
case 8:
- m_creature->SummonCreature(11054,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054, ADD_9X, ADD_9Y, ADD_9Z, ADD_9O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
+ m_creature->SummonCreature(11054, ADD_3X, ADD_3Y, ADD_3Z, ADD_3O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 240000);
break;
}
//30 seconds until we should cast this again
Index: scripts/zone/stratholme/mobs_stratholme.cpp
===================================================================
--- scripts/zone/stratholme/mobs_stratholme.cpp (revision 275)
+++ scripts/zone/stratholme/mobs_stratholme.cpp (working copy)
@@ -114,7 +114,7 @@
case 1: RandY = 0 + Rand; break;
}
Rand = 0;
- DoSpawnCreature(11136, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 300000);
+ DoSpawnCreature(11136, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 300000);
}
void SpellHit(Unit *caster, const SpellEntry *spell)
@@ -204,7 +204,7 @@
case 1: RandY = 0 + Rand; break;
}
Rand = 0;
- DoSpawnCreature(11122, RandX, RandY, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 600000);
+ DoSpawnCreature(11122, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 600000);
}
void SpellHit(Unit *caster, const SpellEntry *spell)
Index: scripts/zone/stratholme/boss_nerubenkan.cpp
===================================================================
--- scripts/zone/stratholme/boss_nerubenkan.cpp (revision 275)
+++ scripts/zone/stratholme/boss_nerubenkan.cpp (working copy)
@@ -105,7 +105,7 @@
case 1: RandY = 0 + Rand; break;
}
Rand = 0;
- Summoned = DoSpawnCreature(10876, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000);
+ Summoned = DoSpawnCreature(10876, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000);
if(Summoned)
((CreatureAI*)Summoned->AI())->AttackStart(victim);
}
Index: scripts/zone/stratholme/boss_baron_rivendare.cpp
===================================================================
--- scripts/zone/stratholme/boss_baron_rivendare.cpp (revision 275)
+++ scripts/zone/stratholme/boss_baron_rivendare.cpp (working copy)
@@ -220,7 +220,7 @@
// }else RaiseDead_Timer -= diff;
//SummonSkeletons
- //Creature* Unit::SummonCreature(uint32 id, float x, float y, float z, float ang,TempSummonType spwtype,uint32 despwtime);
+ //Creature* Unit::SummonCreature(uint32 id, float x, float y, float z, float ang, float spawndist, TempSummonType spwtype,uint32 despwtime);
if (SummonSkeletons_Timer < diff)
{
@@ -228,17 +228,17 @@
target = SelectUnit(SELECT_TARGET_RANDOM,0);
//Cast
- Summoned = m_creature->SummonCreature(11197,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,29000);
+ Summoned = m_creature->SummonCreature(11197, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 29000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(11197,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,29000);
+ Summoned = m_creature->SummonCreature(11197, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 29000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(11197,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,29000);
+ Summoned = m_creature->SummonCreature(11197, ADD_3X, ADD_3Y, ADD_3Z, ADD_3O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 29000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(11197,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,29000);
+ Summoned = m_creature->SummonCreature(11197, ADD_4X, ADD_4Y, ADD_4Z, ADD_4O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 29000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(11197,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,29000);
+ Summoned = m_creature->SummonCreature(11197, ADD_5X, ADD_5Y, ADD_5Z, ADD_5O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 29000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(11197,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,29000);
+ Summoned = m_creature->SummonCreature(11197, ADD_6X, ADD_6Y, ADD_6Z, ADD_6O, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 29000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
//34 seconds until we should cast this again
Index: scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp
===================================================================
--- scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp (revision 275)
+++ scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp (working copy)
@@ -72,7 +72,7 @@
pInstance->SetData(DATA_DOCTORTHEOLENKRASTINOV_DEATH, 0);
if(pInstance->GetData(DATA_CANSPAWNGANDLING))
- m_creature->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, TEMPSUMMON_DEAD_DESPAWN, 0);
+ m_creature->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
}
}
Index: scripts/zone/scholomance/boss_illucia_barov.cpp
===================================================================
--- scripts/zone/scholomance/boss_illucia_barov.cpp (revision 275)
+++ scripts/zone/scholomance/boss_illucia_barov.cpp (working copy)
@@ -75,7 +75,7 @@
pInstance->SetData(DATA_LADYILLUCIABAROV_DEATH, 0);
if(pInstance->GetData(DATA_CANSPAWNGANDLING))
- m_creature->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, TEMPSUMMON_DEAD_DESPAWN, 0);
+ m_creature->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
}
}
Index: scripts/zone/scholomance/boss_instructor_malicia.cpp
===================================================================
--- scripts/zone/scholomance/boss_instructor_malicia.cpp (revision 275)
+++ scripts/zone/scholomance/boss_instructor_malicia.cpp (working copy)
@@ -83,7 +83,7 @@
pInstance->SetData(DATA_INSTRUCTORMALICIA_DEATH, 0);
if(pInstance->GetData(DATA_CANSPAWNGANDLING))
- m_creature->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, TEMPSUMMON_DEAD_DESPAWN, 0);
+ m_creature->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
}
}
Index: scripts/zone/scholomance/boss_darkmaster_gandling.cpp
===================================================================
--- scripts/zone/scholomance/boss_darkmaster_gandling.cpp (revision 275)
+++ scripts/zone/scholomance/boss_darkmaster_gandling.cpp (working copy)
@@ -176,65 +176,65 @@
case 0:
((Player*)target)->TeleportTo(289,250.0696,0.3921,84.8408,3.149);
m_creature->getThreatManager().modifyThreatPercent(target,-100);
- Summoned = m_creature->SummonCreature(16119,254.2325,0.3417,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119, 254.2325, 0.3417, 84.8407, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(16119,257.7133,4.0226,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119, 257.7133, 4.0226, 84.8407, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(16119,258.6702,-2.60656,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119, 258.6702, -2.60656, 84.8407, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
break;
case 1:
((Player*)target)->TeleportTo(289,181.4220,-91.9481,84.8410,1.608);
m_creature->getThreatManager().modifyThreatPercent(target,-100);
- Summoned = m_creature->SummonCreature(16119,184.0519,-73.5649,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119, 184.0519, -73.5649, 84.8407, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(16119,179.5951,-73.7045,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119, 179.5951, -73.7045, 84.8407, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(16119,180.6452,-78.2143,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119, 180.6452, -78.2143, 84.8407, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(16119,283.2274,-78.1518,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119, 283.2274, -78.1518, 84.8407, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
break;
case 2:
((Player*)target)->TeleportTo(289,95.1547,-1.8173,85.2289,0.043);
m_creature->getThreatManager().modifyThreatPercent(target,-100);
- Summoned = m_creature->SummonCreature(16119,100.9404,-1.8016,85.2289,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119, 100.9404, -1.8016, 85.2289, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(16119,101.3729,0.4882,85.2289,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119, 101.3729, 0.4882, 85.2289, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(16119,101.4596,-4.4740,85.2289,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119, 101.4596, -4.4740, 85.2289, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
break;
case 3:
((Player*)target)->TeleportTo(289,250.0696,0.3921,72.6722,3.149);
m_creature->getThreatManager().modifyThreatPercent(target,-100);
- Summoned = m_creature->SummonCreature(16119,240.34481,0.7368,72.6722,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119, 240.34481, 0.7368, 72.6722, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(16119,240.3633,-2.9520,72.6722,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119, 240.3633, -2.9520, 72.6722, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(16119,240.6702,3.34949,72.6722,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119, 240.6702, 3.34949, 72.6722, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
break;
case 4:
((Player*)target)->TeleportTo(289,181.4220,-91.9481,70.7734,1.608);
m_creature->getThreatManager().modifyThreatPercent(target,-100);
- Summoned = m_creature->SummonCreature(16119,184.0519,-73.5649,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119, 184.0519, -73.5649, 70.7734, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(16119,179.5951,-73.7045,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119, 179.5951, -73.7045, 70.7734, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(16119,180.6452,-78.2143,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119, 180.6452, -78.2143, 70.7734, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(16119,283.2274,-78.1518,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119,283.2274, -78.1518, 70.7734, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
break;
case 5:
((Player*)target)->TeleportTo(289,106.1541,-1.8994,75.3663,0.043);
m_creature->getThreatManager().modifyThreatPercent(target,-100);
- Summoned = m_creature->SummonCreature(16119,115.3945,-1.5555,75.3663,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119, 115.3945, -1.5555, 75.3663, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(16119,257.7133,1.8066,75.3663,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119, 257.7133, 1.8066, 75.3663, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
- Summoned = m_creature->SummonCreature(16119,258.6702,-5.1001,75.3663,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = m_creature->SummonCreature(16119, 258.6702, -5.1001, 75.3663, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
((CreatureAI*)Summoned->AI())->AttackStart(target);
break;
}
Index: scripts/zone/scholomance/boss_lord_alexei_barov.cpp
===================================================================
--- scripts/zone/scholomance/boss_lord_alexei_barov.cpp (revision 275)
+++ scripts/zone/scholomance/boss_lord_alexei_barov.cpp (working copy)
@@ -74,7 +74,7 @@
pInstance->SetData(DATA_LORDALEXEIBAROV_DEATH, 0);
if(pInstance->GetData(DATA_CANSPAWNGANDLING))
- m_creature->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, TEMPSUMMON_DEAD_DESPAWN, 0);
+ m_creature->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
}
}
Index: scripts/zone/scholomance/boss_kormok.cpp
===================================================================
--- scripts/zone/scholomance/boss_kormok.cpp (revision 275)
+++ scripts/zone/scholomance/boss_kormok.cpp (working copy)
@@ -129,7 +129,7 @@
case 1: Rand1Y = 0 + Rand1; break;
}
Rand1 = 0;
- SummonedMinions = DoSpawnCreature(16119, Rand1X, Rand1Y, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000);
+ SummonedMinions = DoSpawnCreature(16119, Rand1X, Rand1Y, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000);
((CreatureAI*)SummonedMinions->AI())->AttackStart(victim);
}
@@ -149,7 +149,7 @@
case 1: Rand2Y = 0 + Rand2; break;
}
Rand2 = 0;
- SummonedMages = DoSpawnCreature(16120, Rand2X, Rand2Y, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000);
+ SummonedMages = DoSpawnCreature(16120, Rand2X, Rand2Y, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000);
((CreatureAI*)SummonedMages->AI())->AttackStart(victim);
}
Index: scripts/zone/scholomance/boss_the_ravenian.cpp
===================================================================
--- scripts/zone/scholomance/boss_the_ravenian.cpp (revision 275)
+++ scripts/zone/scholomance/boss_the_ravenian.cpp (working copy)
@@ -79,7 +79,7 @@
pInstance->SetData(DATA_THERAVENIAN_DEATH, 0);
if(pInstance->GetData(DATA_CANSPAWNGANDLING))
- m_creature->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, TEMPSUMMON_DEAD_DESPAWN, 0);
+ m_creature->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
}
}
Index: scripts/zone/scholomance/boss_jandice_barov.cpp
===================================================================
--- scripts/zone/scholomance/boss_jandice_barov.cpp (revision 275)
+++ scripts/zone/scholomance/boss_jandice_barov.cpp (working copy)
@@ -120,7 +120,7 @@
case 1: RandY = 0 + Rand; break;
}
Rand = 0;
- Summoned = DoSpawnCreature(11439, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
+ Summoned = DoSpawnCreature(11439, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
if(Summoned)
((CreatureAI*)Summoned->AI())->AttackStart(victim);
}
Index: scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp
===================================================================
--- scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp (revision 275)
+++ scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp (working copy)
@@ -75,7 +75,7 @@
pInstance->SetData(DATA_LOREKEEPERPOLKELT_DEATH, 0);
if(pInstance->GetData(DATA_CANSPAWNGANDLING))
- m_creature->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, TEMPSUMMON_DEAD_DESPAWN, 0);
+ m_creature->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
}
}
Index: scripts/zone/naxxramas/boss_noth.cpp
===================================================================
--- scripts/zone/naxxramas/boss_noth.cpp (revision 275)
+++ scripts/zone/naxxramas/boss_noth.cpp (working copy)
@@ -217,12 +217,12 @@
Unit* target = NULL;
Unit* SummonedSkeletons = NULL;
- SummonedSkeletons = m_creature->SummonCreature(16984,2684.804,-3502.517,261.313,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
- SummonedSkeletons = m_creature->SummonCreature(16984,2684.804,-3502.517,261.313,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
- SummonedSkeletons = m_creature->SummonCreature(16984,2684.804,-3502.517,261.313,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
- SummonedSkeletons = m_creature->SummonCreature(16984,2684.804,-3502.517,261.313,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
- SummonedSkeletons = m_creature->SummonCreature(16984,2684.804,-3502.517,261.313,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
- SummonedSkeletons = m_creature->SummonCreature(16984,2684.804,-3502.517,261.313,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
+ SummonedSkeletons = m_creature->SummonCreature(16984, 2684.804, -3502.517, 261.313, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 80000);
+ SummonedSkeletons = m_creature->SummonCreature(16984, 2684.804, -3502.517, 261.313, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 80000);
+ SummonedSkeletons = m_creature->SummonCreature(16984, 2684.804, -3502.517, 261.313, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 80000);
+ SummonedSkeletons = m_creature->SummonCreature(16984, 2684.804, -3502.517, 261.313, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 80000);
+ SummonedSkeletons = m_creature->SummonCreature(16984, 2684.804, -3502.517, 261.313, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 80000);
+ SummonedSkeletons = m_creature->SummonCreature(16984, 2684.804, -3502.517, 261.313, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 80000);
if (SummonedSkeletons)
{
Index: scripts/zone/naxxramas/boss_loatheb.cpp
===================================================================
--- scripts/zone/naxxramas/boss_loatheb.cpp (revision 275)
+++ scripts/zone/naxxramas/boss_loatheb.cpp (working copy)
@@ -270,9 +270,9 @@
Unit* target = NULL;
Unit* SummonedSpores = NULL;
- SummonedSpores = m_creature->SummonCreature(16286,ADD_1X,ADD_1Y,ADD_1Z,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
- SummonedSpores = m_creature->SummonCreature(16286,ADD_2X,ADD_2Y,ADD_2Z,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
- SummonedSpores = m_creature->SummonCreature(16286,ADD_3X,ADD_3Y,ADD_3Z,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
+ SummonedSpores = m_creature->SummonCreature(16286, ADD_1X, ADD_1Y, ADD_1Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 80000);
+ SummonedSpores = m_creature->SummonCreature(16286, ADD_2X, ADD_2Y, ADD_2Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 80000);
+ SummonedSpores = m_creature->SummonCreature(16286, ADD_3X, ADD_3Y, ADD_3Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 80000);
if (SummonedSpores)
{
target = SelectUnit(SELECT_TARGET_RANDOM,0);
Index: scripts/zone/naxxramas/boss_gluth.cpp
===================================================================
--- scripts/zone/naxxramas/boss_gluth.cpp (revision 275)
+++ scripts/zone/naxxramas/boss_gluth.cpp (working copy)
@@ -190,15 +190,15 @@
Unit* target = NULL;
Unit* SummonedZombies = NULL;
- SummonedZombies = m_creature->SummonCreature(16360,ADD_1X,ADD_1Y,ADD_1Z,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
- SummonedZombies = m_creature->SummonCreature(16360,ADD_2X,ADD_2Y,ADD_2Z,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
- SummonedZombies = m_creature->SummonCreature(16360,ADD_3X,ADD_3Y,ADD_3Z,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
- SummonedZombies = m_creature->SummonCreature(16360,ADD_4X,ADD_4Y,ADD_4Z,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
- SummonedZombies = m_creature->SummonCreature(16360,ADD_5X,ADD_5Y,ADD_5Z,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
- SummonedZombies = m_creature->SummonCreature(16360,ADD_6X,ADD_6Y,ADD_6Z,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
- SummonedZombies = m_creature->SummonCreature(16360,ADD_7X,ADD_7Y,ADD_7Z,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
- SummonedZombies = m_creature->SummonCreature(16360,ADD_8X,ADD_8Y,ADD_8Z,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
- SummonedZombies = m_creature->SummonCreature(16360,ADD_9X,ADD_9Y,ADD_9Z,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
+ SummonedZombies = m_creature->SummonCreature(16360, ADD_1X, ADD_1Y, ADD_1Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 80000);
+ SummonedZombies = m_creature->SummonCreature(16360, ADD_2X, ADD_2Y, ADD_2Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 80000);
+ SummonedZombies = m_creature->SummonCreature(16360, ADD_3X, ADD_3Y, ADD_3Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 80000);
+ SummonedZombies = m_creature->SummonCreature(16360, ADD_4X, ADD_4Y, ADD_4Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 80000);
+ SummonedZombies = m_creature->SummonCreature(16360, ADD_5X, ADD_5Y, ADD_5Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 80000);
+ SummonedZombies = m_creature->SummonCreature(16360, ADD_6X, ADD_6Y, ADD_6Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 80000);
+ SummonedZombies = m_creature->SummonCreature(16360, ADD_7X, ADD_7Y, ADD_7Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 80000);
+ SummonedZombies = m_creature->SummonCreature(16360, ADD_8X, ADD_8Y, ADD_8Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 80000);
+ SummonedZombies = m_creature->SummonCreature(16360, ADD_9X, ADD_9Y, ADD_9Z, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 80000);
if (SummonedZombies)
{
target = SelectUnit(SELECT_TARGET_RANDOM,0);
Index: scripts/zone/naxxramas/boss_kelthuzad.cpp
===================================================================
--- scripts/zone/naxxramas/boss_kelthuzad.cpp (revision 275)
+++ scripts/zone/naxxramas/boss_kelthuzad.cpp (working copy)
@@ -500,21 +500,21 @@
switch(rand()%6)
{
case 0:
- pUnit = m_creature->SummonCreature(16441,ADDX_LEFT_FAR,ADDY_LEFT_FAR,ADDZ_LEFT_FAR,ADDO_LEFT_FAR,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,1000);
+ pUnit = m_creature->SummonCreature(16441, ADDX_LEFT_FAR, ADDY_LEFT_FAR, ADDZ_LEFT_FAR, ADDO_LEFT_FAR, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000);
//Setting walk position
Walk_Pos_X = WALKX_LEFT_FAR;
Walk_Pos_Y = WALKY_LEFT_FAR;
Walk_Pos_Z = WALKZ_LEFT_FAR;
break;
case 1:
- pUnit = m_creature->SummonCreature(16441,ADDX_LEFT_MIDDLE,ADDY_LEFT_MIDDLE,ADDZ_LEFT_MIDDLE,ADDO_LEFT_MIDDLE,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,1000);
+ pUnit = m_creature->SummonCreature(16441, ADDX_LEFT_MIDDLE, ADDY_LEFT_MIDDLE, ADDZ_LEFT_MIDDLE, ADDO_LEFT_MIDDLE, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000);
//Start moving guardian towards the center of the room
Walk_Pos_X = WALKX_LEFT_MIDDLE;
Walk_Pos_Y = WALKY_LEFT_MIDDLE;
Walk_Pos_Z = WALKZ_LEFT_MIDDLE;
break;
case 2:
- pUnit = m_creature->SummonCreature(16441,ADDX_LEFT_NEAR,ADDY_LEFT_NEAR,ADDZ_LEFT_NEAR,ADDO_LEFT_NEAR,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,1000);
+ pUnit = m_creature->SummonCreature(16441, ADDX_LEFT_NEAR, ADDY_LEFT_NEAR, ADDZ_LEFT_NEAR, ADDO_LEFT_NEAR, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000);
//Start moving guardian towards the center of the room
Walk_Pos_X = WALKX_LEFT_NEAR;
Walk_Pos_Y = WALKY_LEFT_NEAR;
@@ -522,21 +522,21 @@
break;
case 3:
- pUnit = m_creature->SummonCreature(16441,ADDX_RIGHT_FAR,ADDY_RIGHT_FAR,ADDZ_RIGHT_FAR,ADDO_RIGHT_FAR,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,1000);
+ pUnit = m_creature->SummonCreature(16441, ADDX_RIGHT_FAR, ADDY_RIGHT_FAR, ADDZ_RIGHT_FAR, ADDO_RIGHT_FAR, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000);
//Start moving guardian towards the center of the room
Walk_Pos_X = WALKX_RIGHT_FAR;
Walk_Pos_Y = WALKY_RIGHT_FAR;
Walk_Pos_Z = WALKZ_RIGHT_FAR;
break;
case 4:
- pUnit = m_creature->SummonCreature(16441,ADDX_RIGHT_MIDDLE,ADDY_RIGHT_MIDDLE,ADDZ_RIGHT_MIDDLE,ADDO_RIGHT_MIDDLE,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,1000);
+ pUnit = m_creature->SummonCreature(16441, ADDX_RIGHT_MIDDLE, ADDY_RIGHT_MIDDLE, ADDZ_RIGHT_MIDDLE, ADDO_RIGHT_MIDDLE, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000);
//Start moving guardian towards the center of the room
Walk_Pos_X = WALKX_RIGHT_MIDDLE;
Walk_Pos_Y = WALKY_RIGHT_MIDDLE;
Walk_Pos_Z = WALKZ_RIGHT_MIDDLE;
break;
case 5:
- pUnit = m_creature->SummonCreature(16441,ADDX_RIGHT_NEAR,ADDY_RIGHT_NEAR,ADDZ_RIGHT_NEAR,ADDO_RIGHT_NEAR,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,1000);
+ pUnit = m_creature->SummonCreature(16441, ADDX_RIGHT_NEAR, ADDY_RIGHT_NEAR, ADDZ_RIGHT_NEAR, ADDO_RIGHT_NEAR, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000);
//Start moving guardian towards the center of the room
Walk_Pos_X = WALKX_RIGHT_NEAR;
Walk_Pos_Y = WALKY_RIGHT_NEAR;
Index: scripts/zone/naxxramas/boss_maexxna.cpp
===================================================================
--- scripts/zone/naxxramas/boss_maexxna.cpp (revision 275)
+++ scripts/zone/naxxramas/boss_maexxna.cpp (working copy)
@@ -193,15 +193,15 @@
{
case 0:
((Player*)target)->TeleportTo(target->GetMapId(), LOC_X1, LOC_Y1, LOC_Z1, target->GetOrientation());
- Wrap = DoSpawnCreature(16486, LOC_X1, LOC_Y1, LOC_Z1, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+ Wrap = DoSpawnCreature(16486, LOC_X1, LOC_Y1, LOC_Z1, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
break;
case 1:
((Player*)target)->TeleportTo(target->GetMapId(), LOC_X2, LOC_Y2, LOC_Z2, target->GetOrientation());
- Wrap = DoSpawnCreature(16486, LOC_X2, LOC_Y2, LOC_Z2, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+ Wrap = DoSpawnCreature(16486, LOC_X2, LOC_Y2, LOC_Z2, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
break;
case 2:
((Player*)target)->TeleportTo(target->GetMapId(), LOC_X3, LOC_Y3, LOC_Z3, target->GetOrientation());
- Wrap = DoSpawnCreature(16486, LOC_X3, LOC_Y3, LOC_Z3, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+ Wrap = DoSpawnCreature(16486, LOC_X3, LOC_Y3, LOC_Z3, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
break;
}
if(Wrap)
Index: scripts/zone/maraudon/mob_celebras_the_cursed.cpp
===================================================================
--- scripts/zone/maraudon/mob_celebras_the_cursed.cpp (revision 275)
+++ scripts/zone/maraudon/mob_celebras_the_cursed.cpp (working copy)
@@ -104,7 +104,7 @@
case 1: RandY = 0 + Rand; break;
}
Rand = 0;
- Summoned = DoSpawnCreature(13743, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000);
+ Summoned = DoSpawnCreature(13743, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000);
if(Summoned)
((CreatureAI*)Summoned->AI())->AttackStart(victim);
}
Index: scripts/zone/maraudon/boss_landslide.cpp
===================================================================
--- scripts/zone/maraudon/boss_landslide.cpp (revision 275)
+++ scripts/zone/maraudon/boss_landslide.cpp (working copy)
@@ -100,7 +100,7 @@
case 1: RandY = 0 + Rand; break;
}
Rand = 0;
- Summoned = DoSpawnCreature(2736, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000);
+ Summoned = DoSpawnCreature(2736, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000);
if(Summoned)
((CreatureAI*)Summoned->AI())->AttackStart(victim);
}
Index: scripts/zone/maraudon/boss_noxxion.cpp
===================================================================
--- scripts/zone/maraudon/boss_noxxion.cpp (revision 275)
+++ scripts/zone/maraudon/boss_noxxion.cpp (working copy)
@@ -105,7 +105,7 @@
case 1: RandY = 0 + Rand; break;
}
Rand = 0;
- Summoned = DoSpawnCreature(13456, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000);
+ Summoned = DoSpawnCreature(13456, RandX, RandY, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000);
if(Summoned)
((CreatureAI*)Summoned->AI())->AttackStart(victim);
}
Index: scripts/item/item_scripts.cpp
===================================================================
--- scripts/item/item_scripts.cpp (revision 275)
+++ scripts/item/item_scripts.cpp (working copy)
@@ -70,7 +70,7 @@
if (rand()%100 < 35)
{
Creature *Murloc;
- Murloc = player->SummonCreature(17102,player->GetPositionX() ,player->GetPositionY()+20, player->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN,180000);
+ Murloc = player->SummonCreature(17102,player->GetPositionX() ,player->GetPositionY()+20, player->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN,180000);
if (Murloc)
((CreatureAI*)Murloc->AI())->AttackStart(player);
}
@@ -98,8 +98,8 @@
if (player->GetQuestStatus(10832) == QUEST_STATUS_INCOMPLETE)
{
Creature *Nether;
- Nether = player->SummonCreature(22408,player->GetPositionX() ,player->GetPositionY()+20, player->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN,180000);
- Nether = player->SummonCreature(22408,player->GetPositionX() ,player->GetPositionY()-20, player->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN,180000);
+ Nether = player->SummonCreature(22408, player->GetPositionX(), player->GetPositionY()+20, player->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Nether = player->SummonCreature(22408, player->GetPositionX(), player->GetPositionY()-20, player->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 180000);
if (Nether)
((CreatureAI*)Nether->AI())->AttackStart(player);
}
@@ -113,17 +113,17 @@
bool ItemUse_item_skin_of_purest_water(Player *player, Item* _Item, SpellCastTargets const& targets)
{
Creature *Telathion;
- Telathion = player->SummonCreature(17359,player->GetPositionX()+25, player->GetPositionY(), player->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,300000);
+ Telathion = player->SummonCreature(17359, player->GetPositionX()+25, player->GetPositionY(), player->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,300000);
if (Telathion)
((CreatureAI*)Telathion->AI())->AttackStart(player);
Creature *WaterSpirit1;
- WaterSpirit1 = player->SummonCreature(6748,player->GetPositionX()+5, player->GetPositionY()+5, player->GetPositionZ(), 0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,180000);
+ WaterSpirit1 = player->SummonCreature(6748,player->GetPositionX()+5, player->GetPositionY()+5, player->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000);
if (WaterSpirit1 && Telathion)
((CreatureAI*)WaterSpirit1->AI())->AttackStart(Telathion);
Creature *WaterSpirit2;
- WaterSpirit2 = player->SummonCreature(6748,player->GetPositionX()+5, player->GetPositionY()-5, player->GetPositionZ(), 0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,180000);
+ WaterSpirit2 = player->SummonCreature(6748, player->GetPositionX()+5, player->GetPositionY()-5, player->GetPositionZ(), 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,180000);
if (WaterSpirit2 && Telathion)
((CreatureAI*)WaterSpirit2->AI())->AttackStart(Telathion);
Index: ScriptMgr.cpp
===================================================================
--- ScriptMgr.cpp (revision 275)
+++ ScriptMgr.cpp (working copy)
@@ -1811,9 +1811,9 @@
m_creature->SetInFront(unit);
}
-Creature* ScriptedAI::DoSpawnCreature(uint32 id, float x, float y, float z, float angle, uint32 type, uint32 despawntime)
+Creature* ScriptedAI::DoSpawnCreature(uint32 id, float x, float y, float z, float angle, float spawndist, uint32 type, uint32 despawntime)
{
- return m_creature->SummonCreature(id,m_creature->GetPositionX() + x,m_creature->GetPositionY() + y,m_creature->GetPositionZ() + z, angle, (TempSummonType)type, despawntime);
+ return m_creature->SummonCreature(id,m_creature->GetPositionX() + x,m_creature->GetPositionY() + y,m_creature->GetPositionZ() + z, spawndist, angle, (TempSummonType)type, despawntime);
}
Unit* ScriptedAI::SelectUnit(SelectAggroTarget target, uint32 position)
Index: ScriptMgr.h
===================================================================
--- ScriptMgr.h (revision 275)
+++ ScriptMgr.h (working copy)
@@ -193,7 +193,7 @@
void DoFaceTarget(Unit* unit);
//Spawns a creature relative to m_creature
- Creature* DoSpawnCreature(uint32 id, float x, float y, float z, float angle, uint32 type, uint32 despawntime);
+ Creature* DoSpawnCreature(uint32 id, float x, float y, float z, float spawndist, float angle, uint32 type, uint32 despawntime);
//Selects a unit from the creature's current aggro list
Unit* SelectUnit(SelectAggroTarget target, uint32 position);