aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/EasternKingdoms/Scholomance
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/Scholomance
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/Scholomance')
-rw-r--r--src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp90
-rw-r--r--src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp2
7 files changed, 51 insertions, 51 deletions
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
index 847989829ea..677a02b0187 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
@@ -30,25 +30,25 @@ EndScriptData */
#define SPELL_SHADOWSHIELD 22417 //Not right ID. But 12040 is wrong either.
#define SPELL_CURSE 18702
-#define ADD_1X 170.205
-#define ADD_1Y 99.413
-#define ADD_1Z 104.733
-#define ADD_1O 3.16
-
-#define ADD_2X 170.813
-#define ADD_2Y 97.857
-#define ADD_2Z 104.713
-#define ADD_2O 3.16
-
-#define ADD_3X 170.720
-#define ADD_3Y 100.900
-#define ADD_3Z 104.739
-#define ADD_3O 3.16
-
-#define ADD_4X 171.866
-#define ADD_4Y 99.373
-#define ADD_4Z 104.732
-#define ADD_4O 3.16
+#define ADD_1X 170.205f
+#define ADD_1Y 99.413f
+#define ADD_1Z 104.733f
+#define ADD_1O 3.16f
+
+#define ADD_2X 170.813f
+#define ADD_2Y 97.857f
+#define ADD_2Z 104.713f
+#define ADD_2O 3.16f
+
+#define ADD_3X 170.720f
+#define ADD_3Y 100.900f
+#define ADD_3Z 104.739f
+#define ADD_3O 3.16f
+
+#define ADD_4X 171.866f
+#define ADD_4Y 99.373f
+#define ADD_4Z 104.732f
+#define ADD_4O 3.16f
class boss_darkmaster_gandling : public CreatureScript
{
@@ -135,80 +135,80 @@ public:
switch(rand()%6)
{
case 0:
- DoTeleportPlayer(pTarget, 250.0696,0.3921,84.8408,3.149);
- Summoned = me->SummonCreature(16119,254.2325,0.3417,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ DoTeleportPlayer(pTarget, 250.0696f,0.3921f,84.8408f,3.149f);
+ Summoned = me->SummonCreature(16119,254.2325f,0.3417f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
- Summoned = me->SummonCreature(16119,257.7133,4.0226,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = me->SummonCreature(16119,257.7133f,4.0226f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
- Summoned = me->SummonCreature(16119,258.6702,-2.60656,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = me->SummonCreature(16119,258.6702f,-2.60656f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
break;
case 1:
- DoTeleportPlayer(pTarget, 181.4220,-91.9481,84.8410,1.608);
- Summoned = me->SummonCreature(16119,184.0519,-73.5649,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ DoTeleportPlayer(pTarget, 181.4220f,-91.9481f,84.8410f,1.608f);
+ Summoned = me->SummonCreature(16119,184.0519f,-73.5649f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
- Summoned = me->SummonCreature(16119,179.5951,-73.7045,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = me->SummonCreature(16119,179.5951f,-73.7045f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
- Summoned = me->SummonCreature(16119,180.6452,-78.2143,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = me->SummonCreature(16119,180.6452f,-78.2143f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
- Summoned = me->SummonCreature(16119,283.2274,-78.1518,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = me->SummonCreature(16119,283.2274f,-78.1518f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
break;
case 2:
- DoTeleportPlayer(pTarget, 95.1547,-1.8173,85.2289,0.043);
- Summoned = me->SummonCreature(16119,100.9404,-1.8016,85.2289,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ DoTeleportPlayer(pTarget, 95.1547f,-1.8173f,85.2289f,0.043f);
+ Summoned = me->SummonCreature(16119,100.9404f,-1.8016f,85.2289f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
- Summoned = me->SummonCreature(16119,101.3729,0.4882,85.2289,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = me->SummonCreature(16119,101.3729f,0.4882f,85.2289f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
- Summoned = me->SummonCreature(16119,101.4596,-4.4740,85.2289,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = me->SummonCreature(16119,101.4596f,-4.4740f,85.2289f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
break;
case 3:
- DoTeleportPlayer(pTarget, 250.0696,0.3921,72.6722,3.149);
- Summoned = me->SummonCreature(16119,240.34481,0.7368,72.6722,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ DoTeleportPlayer(pTarget, 250.0696f,0.3921f,72.6722f,3.149f);
+ Summoned = me->SummonCreature(16119,240.34481f,0.7368f,72.6722f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
- Summoned = me->SummonCreature(16119,240.3633,-2.9520,72.6722,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = me->SummonCreature(16119,240.3633f,-2.9520f,72.6722f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
- Summoned = me->SummonCreature(16119,240.6702,3.34949,72.6722,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = me->SummonCreature(16119,240.6702f,3.34949f,72.6722f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
break;
case 4:
- DoTeleportPlayer(pTarget, 181.4220,-91.9481,70.7734,1.608);
- Summoned = me->SummonCreature(16119,184.0519,-73.5649,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ DoTeleportPlayer(pTarget, 181.4220f,-91.9481f,70.7734f,1.608f);
+ Summoned = me->SummonCreature(16119,184.0519f,-73.5649f,70.7734f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
- Summoned = me->SummonCreature(16119,179.5951,-73.7045,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = me->SummonCreature(16119,179.5951f,-73.7045f,70.7734f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
- Summoned = me->SummonCreature(16119,180.6452,-78.2143,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = me->SummonCreature(16119,180.6452f,-78.2143f,70.7734f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
- Summoned = me->SummonCreature(16119,283.2274,-78.1518,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = me->SummonCreature(16119,283.2274f,-78.1518f,70.7734f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
break;
case 5:
- DoTeleportPlayer(pTarget, 106.1541,-1.8994,75.3663,0.043);
- Summoned = me->SummonCreature(16119,115.3945,-1.5555,75.3663,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ DoTeleportPlayer(pTarget, 106.1541f,-1.8994f,75.3663f,0.043f);
+ Summoned = me->SummonCreature(16119,115.3945f,-1.5555f,75.3663f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
- Summoned = me->SummonCreature(16119,257.7133,1.8066,75.3663,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = me->SummonCreature(16119,257.7133f,1.8066f,75.3663f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
- Summoned = me->SummonCreature(16119,258.6702,-5.1001,75.3663,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+ Summoned = me->SummonCreature(16119,258.6702f,-5.1001f,75.3663f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Summoned)
Summoned->AI()->AttackStart(pTarget);
break;
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
index ec3a220d6cf..0bac76be60b 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
@@ -68,7 +68,7 @@ public:
pInstance->SetData(DATA_DOCTORTHEOLENKRASTINOV_DEATH, 0);
if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS)
- me->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, TEMPSUMMON_DEAD_DESPAWN, 0);
+ me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0);
}
}
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
index 5cd253a4fd8..0eb2733dfa5 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
@@ -66,7 +66,7 @@ public:
pInstance->SetData(DATA_LADYILLUCIABAROV_DEATH, 0);
if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS)
- me->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, TEMPSUMMON_DEAD_DESPAWN, 0);
+ me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0);
}
}
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
index 61206eeb0ac..abe7dc9252d 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
@@ -73,7 +73,7 @@ public:
pInstance->SetData(DATA_INSTRUCTORMALICIA_DEATH, 0);
if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS)
- me->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, TEMPSUMMON_DEAD_DESPAWN, 0);
+ me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0);
}
}
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
index 0cd36027788..e986f351f04 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
@@ -62,7 +62,7 @@ public:
pInstance->SetData(DATA_LORDALEXEIBAROV_DEATH, 0);
if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS)
- me->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, TEMPSUMMON_DEAD_DESPAWN, 0);
+ me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0);
}
}
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
index 35c0b77bd20..45af5639f7a 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
@@ -66,7 +66,7 @@ public:
pInstance->SetData(DATA_LOREKEEPERPOLKELT_DEATH, 0);
if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS)
- me->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, TEMPSUMMON_DEAD_DESPAWN, 0);
+ me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0);
}
}
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
index 2e0ab8ce201..676de9461bd 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
@@ -68,7 +68,7 @@ public:
pInstance->SetData(DATA_THERAVENIAN_DEATH, 0);
if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS)
- me->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, TEMPSUMMON_DEAD_DESPAWN, 0);
+ me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0);
}
}