aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/EasternKingdoms/ScarletMonastery
diff options
context:
space:
mode:
authorazazel <none@none>2010-08-22 23:46:40 +0600
committerazazel <none@none>2010-08-22 23:46:40 +0600
commit399e35f8f53aeabcda8af513a37bb855340663e5 (patch)
tree7beb6bf445bd0fd46e3341039b6d712bb08bbe2e /src/server/scripts/EasternKingdoms/ScarletMonastery
parentd38135d1fd9417f90ee6f9decc37767f95035596 (diff)
Core:
* fix "warning C4305: 'initializing' : truncation from 'double' to 'float'" warnings * fix some other warnings here and there --HG-- branch : trunk
Diffstat (limited to 'src/server/scripts/EasternKingdoms/ScarletMonastery')
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp50
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp2
3 files changed, 27 insertions, 27 deletions
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
index c98481f9a18..ca36128561e 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
@@ -89,33 +89,33 @@ struct Locations
static Locations FlightPoint[]=
{
- {1754.00,1346.00,17.50},
- {1765.00,1347.00,19.00},
- {1784.00,1346.80,25.40},
- {1803.30,1347.60,33.00},
- {1824.00,1350.00,42.60},
- {1838.80,1353.20,49.80},
- {1852.00,1357.60,55.70},
- {1861.30,1364.00,59.40},
- {1866.30,1374.80,61.70},
- {1864.00,1387.30,63.20},
- {1854.80,1399.40,64.10},
- {1844.00,1406.90,64.10},
- {1824.30,1411.40,63.30},
- {1801.00,1412.30,60.40},
- {1782.00,1410.10,55.50},
- {1770.50,1405.20,50.30},
- {1765.20,1400.70,46.60},
- {1761.40,1393.40,41.70},
- {1759.10,1386.70,36.60},
- {1757.80,1378.20,29.00},
- {1758.00,1367.00,19.51}
+ {1754.00f,1346.00f,17.50f},
+ {1765.00f,1347.00f,19.00f},
+ {1784.00f,1346.80f,25.40f},
+ {1803.30f,1347.60f,33.00f},
+ {1824.00f,1350.00f,42.60f},
+ {1838.80f,1353.20f,49.80f},
+ {1852.00f,1357.60f,55.70f},
+ {1861.30f,1364.00f,59.40f},
+ {1866.30f,1374.80f,61.70f},
+ {1864.00f,1387.30f,63.20f},
+ {1854.80f,1399.40f,64.10f},
+ {1844.00f,1406.90f,64.10f},
+ {1824.30f,1411.40f,63.30f},
+ {1801.00f,1412.30f,60.40f},
+ {1782.00f,1410.10f,55.50f},
+ {1770.50f,1405.20f,50.30f},
+ {1765.20f,1400.70f,46.60f},
+ {1761.40f,1393.40f,41.70f},
+ {1759.10f,1386.70f,36.60f},
+ {1757.80f,1378.20f,29.00f},
+ {1758.00f,1367.00f,19.51f}
};
static Locations Spawn[]=
{
- {1776.27,1348.74,19.20}, //spawn point for pumpkin shrine mob
- {1765.28,1347.46,17.55} //spawn point for smoke
+ {1776.27f,1348.74f,19.20f}, //spawn point for pumpkin shrine mob
+ {1765.28f,1347.46f,17.55f} //spawn point for smoke
};
static const char* Text[]=
@@ -194,7 +194,7 @@ public:
if (!who || Creaturetype != 1 || !who->isTargetableForAttack())
return;
- if (me->IsWithinDist(who, 0.1, false) && !who->HasAura(SPELL_SQUASH_SOUL))
+ if (me->IsWithinDist(who, 0.1f, false) && !who->HasAura(SPELL_SQUASH_SOUL))
DoCast(who, SPELL_SQUASH_SOUL);
}
@@ -718,7 +718,7 @@ public:
if (cleave <= diff)
{
DoCast(me->getVictim(), SPELL_CLEAVE);
- cleave = urand(2000,6000); //1 cleave per 2.0-6.0sec
+ cleave = urand(2000,6000); //1 cleave per 2.0f-6.0fsec
} else cleave -= diff;
}
}
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
index cd6ba9a9f18..d94ece456c0 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
@@ -80,7 +80,7 @@ public:
void JustDied(Unit* /*killer*/)
{
for (uint8 i = 0; i < 20; ++i)
- me->SummonCreature(ENTRY_SCARLET_TRAINEE, 1939.18, -431.58, 17.09, 6.22, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
+ me->SummonCreature(ENTRY_SCARLET_TRAINEE, 1939.18f, -431.58f, 17.09f, 6.22f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
}
void UpdateAI(const uint32 diff)
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
index ec2041049f1..7ae7311b4eb 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
@@ -133,7 +133,7 @@ public:
{
m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, IN_PROGRESS);
- Whitemane->GetMotionMaster()->MovePoint(1,1163.113370,1398.856812,32.527786);
+ Whitemane->GetMotionMaster()->MovePoint(1,1163.113370f,1398.856812f,32.527786f);
me->GetMotionMaster()->MovementExpired();
me->GetMotionMaster()->MoveIdle();