* fix "warning C4305: 'initializing' : truncation from 'double' to 'float'" warnings
* fix some other warnings here and there

--HG--
branch : trunk
This commit is contained in:
azazel committed 2010-08-22 23:46:40 +06:00
1 parent d38135d1fd
commit 399e35f8f5
189 files changed
+2842 -2817

No files matched your search

+26 -26
View File
@@ -292,29 +292,29 @@ static BossAndAdd Boss[]=
const Position SpawnPosition[] =
{
{5754.692, -2939.46, 286.276123, 5.156380}, // stinkbeard || orinoko || korrak
{5762.054199, -2954.385010, 273.826955, 5.108289}, //yggdras
{5776.855, -2989.77979, 272.96814, 5.194} // elementals
{5754.692f, -2939.46f, 286.276123f, 5.156380f}, // stinkbeard || orinoko || korrak
{5762.054199f, -2954.385010f, 273.826955f, 5.108289f}, //yggdras
{5776.855f, -2989.77979f, 272.96814f, 5.194f} // elementals
};
const Position AddSpawnPosition[] =
{
{5722.487, -3010.75, 312.751648, 0.478}, // caster location
{5724.983, -2969.89551, 286.359619, 0.478},
{5733.76025, -3000.34644, 286.359619, 0.478},
{5739.8125, -2981.524, 290.7671, 0.478}, // caster location
{5742.101, -2950.75586, 286.2643, 5.21},
{5743.305, -3011.29736, 290.7671, 0.478}, // caster location
{5744.417, -3025.528, 286.35965, 0.478},
{5763.189, -3029.67529, 290.7671, 0.478},
{5769.401, -2935.121, 286.335754, 5.21},
{5793.061, -2934.593, 286.359619, 3.53},
{5797.32129, -2955.26855, 290.7671, 3.53}, // caster location
{5813.94531, -2956.74683, 286.359619, 3.53},
{5816.85547, -2974.476, 290.7671, 3.53}, // caster location
{5820.30859, -3002.83716, 290.7671, 3.53}, // caster location
{5828.50244, -2981.737, 286.359619, 3.53},
{5828.899, -2960.15479, 312.751648, 3.53}, // caster location
{5722.487f, -3010.75f, 312.751648f, 0.478f}, // caster location
{5724.983f, -2969.89551f, 286.359619f, 0.478f},
{5733.76025f, -3000.34644f, 286.359619f, 0.478f},
{5739.8125f, -2981.524f, 290.7671f, 0.478f}, // caster location
{5742.101f, -2950.75586f, 286.2643f, 5.21f},
{5743.305f, -3011.29736f, 290.7671f, 0.478f}, // caster location
{5744.417f, -3025.528f, 286.35965f, 0.478f},
{5763.189f, -3029.67529f, 290.7671f, 0.478f},
{5769.401f, -2935.121f, 286.335754f, 5.21f},
{5793.061f, -2934.593f, 286.359619f, 3.53f},
{5797.32129f, -2955.26855f, 290.7671f, 3.53f}, // caster location
{5813.94531f, -2956.74683f, 286.359619f, 3.53f},
{5816.85547f, -2974.476f, 290.7671f, 3.53f}, // caster location
{5820.30859f, -3002.83716f, 290.7671f, 3.53f}, // caster location
{5828.50244f, -2981.737f, 286.359619f, 3.53f},
{5828.899f, -2960.15479f, 312.751648f, 3.53f}, // caster location
};
class npc_gurgthock : public CreatureScript
@@ -425,7 +425,7 @@ public:
break;
case 2:
if (Creature* pSummon = Unit::GetCreature(*me, SummonGUID))
pSummon->GetMotionMaster()->MoveJump(5776.319824, -2981.005371, 273.100037, 10.0f, 20.0f);
pSummon->GetMotionMaster()->MoveJump(5776.319824f, -2981.005371f, 273.100037f, 10.0f, 20.0f);
uiPhase = 0;
SummonGUID = 0;
break;
@@ -824,14 +824,14 @@ public:
if (!UpdateVictim())
return;
if (me->getVictim()->GetPositionZ() >= 286.276)
if (me->getVictim()->GetPositionZ() >= 286.276f)
{
std::list<HostileReference *> t_list = me->getThreatManager().getThreatList();
for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
{
if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid()))
{
if (pUnit->GetPositionZ() <= 286.276)
if (pUnit->GetPositionZ() <= 286.276f)
{
me->getThreatManager().resetAllAggro();
me->AddThreat(pUnit,5.0f);
@@ -947,14 +947,14 @@ public:
if (Unit* victim = me->getVictim())
{
if (victim->GetPositionZ() >= 286.276)
if (victim->GetPositionZ() >= 286.276f)
{
std::list<HostileReference *> t_list = me->getThreatManager().getThreatList();
for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
{
if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid()))
{
if (pUnit->GetPositionZ() <= 286.276)
if (pUnit->GetPositionZ() <= 286.276f)
{
me->getThreatManager().resetAllAggro();
me->AddThreat(pUnit,5.0f);
@@ -1092,14 +1092,14 @@ public:
if (!UpdateVictim())
return;
if (me->getVictim()->GetPositionZ() >= 286.276)
if (me->getVictim()->GetPositionZ() >= 286.276f)
{
std::list<HostileReference *> t_list = me->getThreatManager().getThreatList();
for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
{
if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid()))
{
if (pUnit->GetPositionZ() <= 286.276)
if (pUnit->GetPositionZ() <= 286.276f)
{
me->getThreatManager().resetAllAggro();
me->AddThreat(pUnit,5.0f);