Core: Fix more warnings
--HG-- branch : trunk
This commit is contained in:
@@ -555,7 +555,7 @@ public:
|
||||
|
||||
if (SummonWispTimer <= diff)
|
||||
{
|
||||
DoSpawnCreature(CREATURE_ANCIENT_WISP, rand()%40, rand()%40, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
|
||||
DoSpawnCreature(CREATURE_ANCIENT_WISP, float(rand()%40), float(rand()%40), 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
|
||||
SummonWispTimer = 1500;
|
||||
++WispCount;
|
||||
} else SummonWispTimer -= diff;
|
||||
|
||||
@@ -720,7 +720,7 @@ void hyjalAI::DeSpawnVeins()
|
||||
if (!ai)return;
|
||||
for (uint8 i = 0; i<7; ++i)
|
||||
{
|
||||
if (GameObject* gem = pInstance->instance->GetGameObject(pInstance->GetData64(ai->VeinGUID[i])))
|
||||
if (GameObject* gem = pInstance->instance->GetGameObject(ai->VeinGUID[i]))
|
||||
gem->Delete();
|
||||
}
|
||||
} else if (Faction)
|
||||
@@ -731,7 +731,7 @@ void hyjalAI::DeSpawnVeins()
|
||||
if (!ai)return;
|
||||
for (uint8 i = 7; i<14; ++i)
|
||||
{
|
||||
if (GameObject* gem = pInstance->instance->GetGameObject(pInstance->GetData64(ai->VeinGUID[i])))
|
||||
if (GameObject* gem = pInstance->instance->GetGameObject(ai->VeinGUID[i]))
|
||||
gem->Delete();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -63,7 +63,7 @@ public:
|
||||
|
||||
void SummonAdds(Unit* pVictim)
|
||||
{
|
||||
if (Creature *Add = DoSpawnCreature(13456, irand(-7,7), irand(-7,7), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000))
|
||||
if (Creature *Add = DoSpawnCreature(13456, float(irand(-7,7)), float(irand(-7,7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000))
|
||||
Add->AI()->AttackStart(pVictim);
|
||||
}
|
||||
|
||||
|
||||
@@ -730,7 +730,7 @@ public:
|
||||
if (pUnit && i->second == true)
|
||||
{
|
||||
//Teleport each player out
|
||||
DoTeleportPlayer(pUnit, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+10, rand()%6);
|
||||
DoTeleportPlayer(pUnit, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+10, float(rand()%6));
|
||||
|
||||
//Cast knockback on them
|
||||
DoCast(pUnit, SPELL_EXIT_STOMACH_KNOCKBACK, true);
|
||||
@@ -767,7 +767,7 @@ public:
|
||||
if (pUnit->IsWithinDist3d(&KickPos, 15.0f))
|
||||
{
|
||||
//Teleport each player out
|
||||
DoTeleportPlayer(pUnit, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+10, rand()%6);
|
||||
DoTeleportPlayer(pUnit, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+10, float(rand()%6));
|
||||
|
||||
//Cast knockback on them
|
||||
DoCast(pUnit, SPELL_EXIT_STOMACH_KNOCKBACK, true);
|
||||
|
||||
@@ -55,8 +55,8 @@ public:
|
||||
uint32 SpawnHatchlings_Timer;
|
||||
uint32 SpawnSpawns_Timer;
|
||||
int Rand;
|
||||
int RandX;
|
||||
int RandY;
|
||||
float RandX;
|
||||
float RandY;
|
||||
|
||||
Creature* Hatchling;
|
||||
Creature* Spawn;
|
||||
@@ -76,15 +76,15 @@ public:
|
||||
Rand = 10 + (rand()%10);
|
||||
switch (rand()%2)
|
||||
{
|
||||
case 0: RandX = 0 - Rand; break;
|
||||
case 1: RandX = 0 + Rand; break;
|
||||
case 0: RandX = 0.0f - Rand; break;
|
||||
case 1: RandX = 0.0f + Rand; break;
|
||||
}
|
||||
Rand = 0;
|
||||
Rand = 10 + (rand()%10);
|
||||
switch (rand()%2)
|
||||
{
|
||||
case 0: RandY = 0 - Rand; break;
|
||||
case 1: RandY = 0 + Rand; break;
|
||||
case 0: RandY = 0.0f - Rand; break;
|
||||
case 1: RandY = 0.0f + Rand; break;
|
||||
}
|
||||
Rand = 0;
|
||||
Spawn = DoSpawnCreature(15630, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
|
||||
|
||||
@@ -314,7 +314,7 @@ public:
|
||||
if (pyramidSpawns[i][0] == (float)wave)
|
||||
{
|
||||
Position pos = {pyramidSpawns[i][2], pyramidSpawns[i][3], 8.87f, 0};
|
||||
TempSummon* ts = instance->SummonCreature(pyramidSpawns[i][1],pos);
|
||||
TempSummon* ts = instance->SummonCreature(uint32(pyramidSpawns[i][1]),pos);
|
||||
ts->GetMotionMaster()->MoveRandom(10);
|
||||
addsAtBase.push_back(ts->GetGUID());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user