diff options
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
59 files changed, 522 insertions, 522 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp index ac1475b3097..77719cc80a2 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp @@ -114,7 +114,7 @@ public: return false; pInstance->SetData(TYPE_RING_OF_LAW,IN_PROGRESS); - pPlayer->SummonCreature(NPC_GRIMSTONE,625.559,-205.618,-52.735,2.609,TEMPSUMMON_DEAD_DESPAWN,0); + pPlayer->SummonCreature(NPC_GRIMSTONE,625.559f,-205.618f,-52.735f,2.609f,TEMPSUMMON_DEAD_DESPAWN,0); return false; } @@ -191,7 +191,7 @@ public: //TODO: move them to center void SummonRingMob() { - if (Creature* tmp = me->SummonCreature(RingMob[MobSpawnId],608.960,-235.322,-53.907,1.857,TEMPSUMMON_DEAD_DESPAWN,0)) + if (Creature* tmp = me->SummonCreature(RingMob[MobSpawnId],608.960f,-235.322f,-53.907f,1.857f,TEMPSUMMON_DEAD_DESPAWN,0)) RingMobGUID[MobCount] = tmp->GetGUID(); ++MobCount; @@ -203,7 +203,7 @@ public: //TODO: move them to center void SummonRingBoss() { - if (Creature* tmp = me->SummonCreature(RingBoss[rand()%6],644.300,-175.989,-53.739,3.418,TEMPSUMMON_DEAD_DESPAWN,0)) + if (Creature* tmp = me->SummonCreature(RingBoss[rand()%6],644.300f,-175.989f,-53.739f,3.418f,TEMPSUMMON_DEAD_DESPAWN,0)) RingBossGUID = tmp->GetGUID(); MobDeath_Timer = 2500; @@ -626,9 +626,9 @@ public: { npc_dughal_stormwingAI* dughal_stormwingAI = new npc_dughal_stormwingAI(pCreature); - dughal_stormwingAI->AddWaypoint(0, 280.42,-82.86, -77.12,0); - dughal_stormwingAI->AddWaypoint(1, 287.64,-87.01, -76.79,0); - dughal_stormwingAI->AddWaypoint(2, 354.63,-64.95, -67.53,0); + dughal_stormwingAI->AddWaypoint(0, 280.42f,-82.86f, -77.12f,0); + dughal_stormwingAI->AddWaypoint(1, 287.64f,-87.01f, -76.79f,0); + dughal_stormwingAI->AddWaypoint(2, 354.63f,-64.95f, -67.53f,0); return dughal_stormwingAI; } @@ -736,26 +736,26 @@ public: { npc_marshal_windsorAI* marshal_windsorAI = new npc_marshal_windsorAI(pCreature); - marshal_windsorAI->AddWaypoint(0, 316.336,-225.528, -77.7258,7000); - marshal_windsorAI->AddWaypoint(1, 316.336,-225.528, -77.7258,2000); - marshal_windsorAI->AddWaypoint(2, 322.96,-207.13, -77.87,0); - marshal_windsorAI->AddWaypoint(3, 281.05,-172.16, -75.12,0); - marshal_windsorAI->AddWaypoint(4, 272.19,-139.14, -70.61,0); - marshal_windsorAI->AddWaypoint(5, 283.62,-116.09, -70.21,0); - marshal_windsorAI->AddWaypoint(6, 296.18,-94.30, -74.08,0); - marshal_windsorAI->AddWaypoint(7, 294.57,-93.11, -74.08,0); - marshal_windsorAI->AddWaypoint(8, 314.31,-74.31, -76.09,0); - marshal_windsorAI->AddWaypoint(9, 360.22,-62.93, -66.77,0); - marshal_windsorAI->AddWaypoint(10, 383.38,-69.40, -63.25,0); - marshal_windsorAI->AddWaypoint(11, 389.99,-67.86, -62.57,0); - marshal_windsorAI->AddWaypoint(12, 400.98,-72.01, -62.31,0); - marshal_windsorAI->AddWaypoint(13, 404.22,-62.30, -63.50,2300); - marshal_windsorAI->AddWaypoint(14, 404.22,-62.30, -63.50,1500); - marshal_windsorAI->AddWaypoint(15, 407.65,-51.86, -63.96,0); - marshal_windsorAI->AddWaypoint(16, 403.61,-51.71, -63.92,1000); - marshal_windsorAI->AddWaypoint(17, 403.61,-51.71, -63.92,2000); - marshal_windsorAI->AddWaypoint(18, 403.61,-51.71, -63.92,1000); - marshal_windsorAI->AddWaypoint(19, 403.61,-51.71, -63.92,0); + marshal_windsorAI->AddWaypoint(0, 316.336f,-225.528f, -77.7258f,7000); + marshal_windsorAI->AddWaypoint(1, 316.336f,-225.528f, -77.7258f,2000); + marshal_windsorAI->AddWaypoint(2, 322.96f,-207.13f, -77.87f,0); + marshal_windsorAI->AddWaypoint(3, 281.05f,-172.16f, -75.12f,0); + marshal_windsorAI->AddWaypoint(4, 272.19f,-139.14f, -70.61f,0); + marshal_windsorAI->AddWaypoint(5, 283.62f,-116.09f, -70.21f,0); + marshal_windsorAI->AddWaypoint(6, 296.18f,-94.30f, -74.08f,0); + marshal_windsorAI->AddWaypoint(7, 294.57f,-93.11f, -74.08f,0); + marshal_windsorAI->AddWaypoint(8, 314.31f,-74.31f, -76.09f,0); + marshal_windsorAI->AddWaypoint(9, 360.22f,-62.93f, -66.77f,0); + marshal_windsorAI->AddWaypoint(10, 383.38f,-69.40f, -63.25f,0); + marshal_windsorAI->AddWaypoint(11, 389.99f,-67.86f, -62.57f,0); + marshal_windsorAI->AddWaypoint(12, 400.98f,-72.01f, -62.31f,0); + marshal_windsorAI->AddWaypoint(13, 404.22f,-62.30f, -63.50f,2300); + marshal_windsorAI->AddWaypoint(14, 404.22f,-62.30f, -63.50f,1500); + marshal_windsorAI->AddWaypoint(15, 407.65f,-51.86f, -63.96f,0); + marshal_windsorAI->AddWaypoint(16, 403.61f,-51.71f, -63.92f,1000); + marshal_windsorAI->AddWaypoint(17, 403.61f,-51.71f, -63.92f,2000); + marshal_windsorAI->AddWaypoint(18, 403.61f,-51.71f, -63.92f,1000); + marshal_windsorAI->AddWaypoint(19, 403.61f,-51.71f, -63.92f,0); return marshal_windsorAI; } @@ -821,7 +821,7 @@ public: me->SetVisibility(VISIBILITY_OFF); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->SummonCreature(MOB_ENTRY_REGINALD_WINDSOR,403.61,-51.71,-63.92,3.600434,TEMPSUMMON_DEAD_DESPAWN ,0); + me->SummonCreature(MOB_ENTRY_REGINALD_WINDSOR,403.61f,-51.71f,-63.92f,3.600434f,TEMPSUMMON_DEAD_DESPAWN ,0); pInstance->SetData(DATA_SUPPLY_ROOM, ENCOUNTER_STATE_ENDED); break; } @@ -910,41 +910,41 @@ public: { npc_marshal_reginald_windsorAI* marshal_reginald_windsorAI = new npc_marshal_reginald_windsorAI(pCreature); - marshal_reginald_windsorAI->AddWaypoint(0, 403.61,-52.71, -63.92,4000); - marshal_reginald_windsorAI->AddWaypoint(1, 403.61,-52.71, -63.92,4000); - marshal_reginald_windsorAI->AddWaypoint(2, 406.33,-54.87, -63.95,0); - marshal_reginald_windsorAI->AddWaypoint(3, 407.99,-73.91, -62.26,0); - marshal_reginald_windsorAI->AddWaypoint(4, 557.03,-119.71, -61.83,0); - marshal_reginald_windsorAI->AddWaypoint(5, 573.40,-124.39, -65.07,0); - marshal_reginald_windsorAI->AddWaypoint(6, 593.91,-130.29, -69.25,0); - marshal_reginald_windsorAI->AddWaypoint(7, 593.21,-132.16, -69.25,0); - marshal_reginald_windsorAI->AddWaypoint(8, 593.21,-132.16, -69.25,3000); - marshal_reginald_windsorAI->AddWaypoint(9, 622.81,-135.55, -71.92,0); - marshal_reginald_windsorAI->AddWaypoint(10, 634.68,-151.29, -70.32,0); - marshal_reginald_windsorAI->AddWaypoint(11, 635.06,-153.25, -70.32,0); - marshal_reginald_windsorAI->AddWaypoint(12, 635.06,-153.25, -70.32,3000); - marshal_reginald_windsorAI->AddWaypoint(13, 635.06,-153.25, -70.32,1500); - marshal_reginald_windsorAI->AddWaypoint(14, 655.25,-172.39, -73.72,0); - marshal_reginald_windsorAI->AddWaypoint(15, 654.79,-226.30, -83.06,0); - marshal_reginald_windsorAI->AddWaypoint(16, 622.85,-268.85, -83.96,0); - marshal_reginald_windsorAI->AddWaypoint(17, 579.45,-275.56, -80.44,0); - marshal_reginald_windsorAI->AddWaypoint(18, 561.19,-266.85, -75.59,0); - marshal_reginald_windsorAI->AddWaypoint(19, 547.91,-253.92, -70.34,0); - marshal_reginald_windsorAI->AddWaypoint(20, 549.20,-252.40, -70.34,0); - marshal_reginald_windsorAI->AddWaypoint(21, 549.20,-252.40, -70.34,4000); - marshal_reginald_windsorAI->AddWaypoint(22, 555.33,-269.16, -74.40,0); - marshal_reginald_windsorAI->AddWaypoint(23, 554.31,-270.88, -74.40,0); - marshal_reginald_windsorAI->AddWaypoint(24, 554.31,-270.88, -74.40,4000); - marshal_reginald_windsorAI->AddWaypoint(25, 536.10,-249.60, -67.47,0); - marshal_reginald_windsorAI->AddWaypoint(26, 520.94,-216.65, -59.28,0); - marshal_reginald_windsorAI->AddWaypoint(27, 505.99,-148.74, -62.17,0); - marshal_reginald_windsorAI->AddWaypoint(28, 484.21,-56.24, -62.43,0); - marshal_reginald_windsorAI->AddWaypoint(29, 470.39,-6.01, -70.10,0); - marshal_reginald_windsorAI->AddWaypoint(30, 451.27,30.85, -70.07,0); - marshal_reginald_windsorAI->AddWaypoint(31, 452.45,29.85, -70.37,1500); - marshal_reginald_windsorAI->AddWaypoint(32, 452.45,29.85, -70.37,7000); - marshal_reginald_windsorAI->AddWaypoint(33, 452.45,29.85, -70.37,10000); - marshal_reginald_windsorAI->AddWaypoint(34, 451.27,31.85, -70.07,0); + marshal_reginald_windsorAI->AddWaypoint(0, 403.61f,-52.71f, -63.92f,4000); + marshal_reginald_windsorAI->AddWaypoint(1, 403.61f,-52.71f, -63.92f,4000); + marshal_reginald_windsorAI->AddWaypoint(2, 406.33f,-54.87f, -63.95f,0); + marshal_reginald_windsorAI->AddWaypoint(3, 407.99f,-73.91f, -62.26f,0); + marshal_reginald_windsorAI->AddWaypoint(4, 557.03f,-119.71f, -61.83f,0); + marshal_reginald_windsorAI->AddWaypoint(5, 573.40f,-124.39f, -65.07f,0); + marshal_reginald_windsorAI->AddWaypoint(6, 593.91f,-130.29f, -69.25f,0); + marshal_reginald_windsorAI->AddWaypoint(7, 593.21f,-132.16f, -69.25f,0); + marshal_reginald_windsorAI->AddWaypoint(8, 593.21f,-132.16f, -69.25f,3000); + marshal_reginald_windsorAI->AddWaypoint(9, 622.81f,-135.55f, -71.92f,0); + marshal_reginald_windsorAI->AddWaypoint(10, 634.68f,-151.29f, -70.32f,0); + marshal_reginald_windsorAI->AddWaypoint(11, 635.06f,-153.25f, -70.32f,0); + marshal_reginald_windsorAI->AddWaypoint(12, 635.06f,-153.25f, -70.32f,3000); + marshal_reginald_windsorAI->AddWaypoint(13, 635.06f,-153.25f, -70.32f,1500); + marshal_reginald_windsorAI->AddWaypoint(14, 655.25f,-172.39f, -73.72f,0); + marshal_reginald_windsorAI->AddWaypoint(15, 654.79f,-226.30f, -83.06f,0); + marshal_reginald_windsorAI->AddWaypoint(16, 622.85f,-268.85f, -83.96f,0); + marshal_reginald_windsorAI->AddWaypoint(17, 579.45f,-275.56f, -80.44f,0); + marshal_reginald_windsorAI->AddWaypoint(18, 561.19f,-266.85f, -75.59f,0); + marshal_reginald_windsorAI->AddWaypoint(19, 547.91f,-253.92f, -70.34f,0); + marshal_reginald_windsorAI->AddWaypoint(20, 549.20f,-252.40f, -70.34f,0); + marshal_reginald_windsorAI->AddWaypoint(21, 549.20f,-252.40f, -70.34f,4000); + marshal_reginald_windsorAI->AddWaypoint(22, 555.33f,-269.16f, -74.40f,0); + marshal_reginald_windsorAI->AddWaypoint(23, 554.31f,-270.88f, -74.40f,0); + marshal_reginald_windsorAI->AddWaypoint(24, 554.31f,-270.88f, -74.40f,4000); + marshal_reginald_windsorAI->AddWaypoint(25, 536.10f,-249.60f, -67.47f,0); + marshal_reginald_windsorAI->AddWaypoint(26, 520.94f,-216.65f, -59.28f,0); + marshal_reginald_windsorAI->AddWaypoint(27, 505.99f,-148.74f, -62.17f,0); + marshal_reginald_windsorAI->AddWaypoint(28, 484.21f,-56.24f, -62.43f,0); + marshal_reginald_windsorAI->AddWaypoint(29, 470.39f,-6.01f, -70.10f,0); + marshal_reginald_windsorAI->AddWaypoint(30, 451.27f,30.85f, -70.07f,0); + marshal_reginald_windsorAI->AddWaypoint(31, 452.45f,29.85f, -70.37f,1500); + marshal_reginald_windsorAI->AddWaypoint(32, 452.45f,29.85f, -70.37f,7000); + marshal_reginald_windsorAI->AddWaypoint(33, 452.45f,29.85f, -70.37f,10000); + marshal_reginald_windsorAI->AddWaypoint(34, 451.27f,31.85f, -70.07f,0); return marshal_reginald_windsorAI; } @@ -1022,7 +1022,7 @@ public: { if (CAST_PLR(who)->GetQuestStatus(4322) == QUEST_STATUS_INCOMPLETE) { - float Radius = 10.0; + float Radius = 10.0f; if (me->IsWithinDistInMap(who, Radius)) { SetEscortPaused(false); @@ -1113,11 +1113,11 @@ public: { npc_tobias_seecherAI* tobias_seecherAI = new npc_tobias_seecherAI(pCreature); - tobias_seecherAI->AddWaypoint(0, 549.21, -281.07, -75.27); - tobias_seecherAI->AddWaypoint(1, 554.39, -267.39, -73.68); - tobias_seecherAI->AddWaypoint(2, 533.59, -249.38, -67.04); - tobias_seecherAI->AddWaypoint(3, 519.44, -217.02, -59.34); - tobias_seecherAI->AddWaypoint(4, 506.55, -153.49, -62.34); + tobias_seecherAI->AddWaypoint(0, 549.21f, -281.07f, -75.27f); + tobias_seecherAI->AddWaypoint(1, 554.39f, -267.39f, -73.68f); + tobias_seecherAI->AddWaypoint(2, 533.59f, -249.38f, -67.04f); + tobias_seecherAI->AddWaypoint(3, 519.44f, -217.02f, -59.34f); + tobias_seecherAI->AddWaypoint(4, 506.55f, -153.49f, -62.34f); return tobias_seecherAI; } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp index 5268ee11430..42031639071 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp @@ -28,10 +28,10 @@ EndScriptData */ #define SPELL_CROWDPUMMEL 10887 #define SPELL_MIGHTYBLOW 14099 -#define ADD_1X -169.839203 -#define ADD_1Y -324.961395 -#define ADD_1Z 64.401443 -#define ADD_1O 3.124724 +#define ADD_1X -169.839203f +#define ADD_1Y -324.961395f +#define ADD_1Z 64.401443f +#define ADD_1O 3.124724f class boss_halycon : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp index 8a304d4fc00..1ec09bdf429 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp @@ -30,15 +30,15 @@ EndScriptData */ #define SPELL_CLEAVE 20691 #define SPELL_KNOCKAWAY 20686 -#define ADD_1X -39.355381 -#define ADD_1Y -513.456482 -#define ADD_1Z 88.472046 -#define ADD_1O 4.679872 - -#define ADD_2X -49.875881 -#define ADD_2Y -511.896942 -#define ADD_2Z 88.195160 -#define ADD_2O 4.613114 +#define ADD_1X -39.355381f +#define ADD_1Y -513.456482f +#define ADD_1Z 88.472046f +#define ADD_1O 4.679872f + +#define ADD_2X -49.875881f +#define ADD_2Y -511.896942f +#define ADD_2Z 88.195160f +#define ADD_2O 4.613114f class boss_overlord_wyrmthalak : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp index 155b6b962bb..b4684a01f92 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp @@ -42,12 +42,12 @@ EndScriptData */ #define CREATURE_CHROMATIC_DRAKANOID 14302 #define CREATURE_NEFARIAN 11583 -#define ADD_X1 -7591.151855 -#define ADD_X2 -7514.598633 -#define ADD_Y1 -1204.051880 -#define ADD_Y2 -1150.448853 -#define ADD_Z1 476.800476 -#define ADD_Z2 476.796570 +#define ADD_X1 -7591.151855f +#define ADD_X2 -7514.598633f +#define ADD_Y1 -1204.051880f +#define ADD_Y2 -1150.448853f +#define ADD_Z1 476.800476f +#define ADD_Z2 476.796570f #define NEF_X -7445 #define NEF_Y -1332 @@ -300,7 +300,7 @@ public: ++SpawnedAdds; //Spawn Creature and force it to start attacking a random target - Spawned = me->SummonCreature(CreatureID,ADD_X1,ADD_Y1,ADD_Z1,5.000,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + Spawned = me->SummonCreature(CreatureID,ADD_X1,ADD_Y1,ADD_Z1,5.000f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget && Spawned) { @@ -316,7 +316,7 @@ public: ++SpawnedAdds; - Spawned = me->SummonCreature(CreatureID,ADD_X2,ADD_Y2,ADD_Z2,5.000,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + Spawned = me->SummonCreature(CreatureID,ADD_X2,ADD_Y2,ADD_Z2,5.000f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget && Spawned) { diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index 9216274b287..5bf7012f897 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -157,7 +157,7 @@ class instance_deadmines : public InstanceMapScript void MoveCreatureInside(Creature* pCreature) { pCreature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pCreature->GetMotionMaster()->MovePoint(0, -102.7,-655.9, pCreature->GetPositionZ()); + pCreature->GetMotionMaster()->MovePoint(0, -102.7f,-655.9f, pCreature->GetPositionZ()); } void ShootCannon() diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp index a89454038ee..f6c7e180afa 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp @@ -66,23 +66,23 @@ enum eBlastmasterEmiShortfuse const Position SpawnPosition[] = { - {-557.630,-114.514,-152.209,0.641}, - {-555.263,-113.802,-152.737,0.311}, - {-552.154,-112.476,-153.349,0.621}, - {-548.692,-111.089,-154.090,0.621}, - {-546.905,-108.340,-154.877,0.729}, - {-547.736,-105.154,-155.176,0.372}, - {-547.274,-114.109,-153.952,0.735}, - {-552.534,-110.012,-153.577,0.747}, - {-550.708,-116.436,-153.103,0.679}, - {-554.030,-115.983,-152.635,0.695}, - {-494.595,-87.516,149.116,3.344}, - {-493.349,-90.845,-148.882,3.717}, - {-491.995,-87.619,-148.197,3.230}, - {-490.732,-90.739,-148.091,3.230}, - {-490.554,-89.114,-148.055,3.230}, - {-495.240,-90.808,-149.493,3.238}, - {-494.195,-89.553,-149.131,3.254} + {-557.630f,-114.514f,-152.209f,0.641f}, + {-555.263f,-113.802f,-152.737f,0.311f}, + {-552.154f,-112.476f,-153.349f,0.621f}, + {-548.692f,-111.089f,-154.090f,0.621f}, + {-546.905f,-108.340f,-154.877f,0.729f}, + {-547.736f,-105.154f,-155.176f,0.372f}, + {-547.274f,-114.109f,-153.952f,0.735f}, + {-552.534f,-110.012f,-153.577f,0.747f}, + {-550.708f,-116.436f,-153.103f,0.679f}, + {-554.030f,-115.983f,-152.635f,0.695f}, + {-494.595f,-87.516f,149.116f,3.344f}, + {-493.349f,-90.845f,-148.882f,3.717f}, + {-491.995f,-87.619f,-148.197f,3.230f}, + {-490.732f,-90.739f,-148.091f,3.230f}, + {-490.554f,-89.114f,-148.055f,3.230f}, + {-495.240f,-90.808f,-149.493f,3.238f}, + {-494.195f,-89.553f,-149.131f,3.254f} }; class npc_blastmaster_emi_shortfuse : public CreatureScript @@ -353,7 +353,7 @@ public: me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[9], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); break; case 2: - if (GameObject* pGo = me->SummonGameObject(183410, -533.140,-105.322,-156.016, 0, 0, 0, 0, 0, 1000)) + if (GameObject* pGo = me->SummonGameObject(183410, -533.140f,-105.322f,-156.016f, 0, 0, 0, 0, 0, 1000)) { GoSummonList.push_back(pGo->GetGUID()); pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); //We can't use it! @@ -368,7 +368,7 @@ public: DoScriptText(SAY_BLASTMASTER_19,me); break; case 4: - if (GameObject* pGo = me->SummonGameObject(183410, -542.199,-96.854,-155.790, 0, 0, 0, 0, 0, 1000)) + if (GameObject* pGo = me->SummonGameObject(183410, -542.199f,-96.854f,-155.790f, 0, 0, 0, 0, 0, 1000)) { GoSummonList.push_back(pGo->GetGUID()); pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); @@ -388,7 +388,7 @@ public: me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[14], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); break; case 7: - if (GameObject* pGo = me->SummonGameObject(183410, -507.820,-103.333,-151.353, 0, 0, 0, 0, 0, 1000)) + if (GameObject* pGo = me->SummonGameObject(183410, -507.820f,-103.333f,-151.353f, 0, 0, 0, 0, 0, 1000)) { GoSummonList.push_back(pGo->GetGUID()); pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); //We can't use it! @@ -396,7 +396,7 @@ public: } break; case 8: - if (GameObject* pGo = me->SummonGameObject(183410, -511.829,-86.249,-151.431, 0, 0, 0, 0, 0, 1000)) + if (GameObject* pGo = me->SummonGameObject(183410, -511.829f,-86.249f,-151.431f, 0, 0, 0, 0, 0, 1000)) { GoSummonList.push_back(pGo->GetGUID()); pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); //We can't use it! diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index 5a3d8805870..78391612fd7 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -40,14 +40,14 @@ EndScriptData */ #define SPELL_GOUGE 29425 #define SPELL_FRENZY 37023 -#define POS_Z 81.73 +#define POS_Z 81.73f float Locations[4][3]= { - {-10991.0, -1884.33, 0.614315}, - {-10989.4, -1885.88, 0.904913}, - {-10978.1, -1887.07, 2.035550}, - {-10975.9, -1885.81, 2.253890}, + {-10991.0f, -1884.33f, 0.614315f}, + {-10989.4f, -1885.88f, 0.904913f}, + {-10978.1f, -1887.07f, 2.035550f}, + {-10975.9f, -1885.81f, 2.253890f}, }; const uint32 Adds[6]= diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index a5dcf11fc1f..983fd44f5de 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -40,9 +40,9 @@ EndScriptData */ const float PortalCoord[3][3] = { - {-11195.353516, -1613.237183, 278.237258}, // Left side - {-11137.846680, -1685.607422, 278.239258}, // Right side - {-11094.493164, -1591.969238, 279.949188} // Back side + {-11195.353516f, -1613.237183f, 278.237258f}, // Left side + {-11137.846680f, -1685.607422f, 278.239258f}, // Right side + {-11094.493164f, -1591.969238f, 279.949188f} // Back side }; enum Netherspite_Portal{ diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index e30efa68a28..886853663be 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -48,14 +48,14 @@ EndScriptData */ float IntroWay[8][3] = { - {-11053.37,-1794.48,149}, - {-11141.07,-1841.40,125}, - {-11187.28,-1890.23,125}, - {-11189.20,-1931.25,125}, - {-11153.76,-1948.93,125}, - {-11128.73,-1929.75,125}, - {-11140 , -1915 ,122}, - {-11163 , -1903 ,91.473} + {-11053.37f,-1794.48f,149.00f}, + {-11141.07f,-1841.40f,125.00f}, + {-11187.28f,-1890.23f,125.00f}, + {-11189.20f,-1931.25f,125.00f}, + {-11153.76f,-1948.93f,125.00f}, + {-11128.73f,-1929.75f,125.00f}, + {-11140.00f,-1915.00f,122.00f}, + {-11163.00f,-1903.00f,91.473f} }; class boss_nightbane : public CreatureScript diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index bf50030a189..a84da32fb03 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -45,28 +45,28 @@ struct InfernalPoint float x,y; }; -#define INFERNAL_Z 275.5 +#define INFERNAL_Z 275.5f static InfernalPoint InfernalPoints[] = { - {-10922.8, -1985.2}, - {-10916.2, -1996.2}, - {-10932.2, -2008.1}, - {-10948.8, -2022.1}, - {-10958.7, -1997.7}, - {-10971.5, -1997.5}, - {-10990.8, -1995.1}, - {-10989.8, -1976.5}, - {-10971.6, -1973.0}, - {-10955.5, -1974.0}, - {-10939.6, -1969.8}, - {-10958.0, -1952.2}, - {-10941.7, -1954.8}, - {-10943.1, -1988.5}, - {-10948.8, -2005.1}, - {-10984.0, -2019.3}, - {-10932.8, -1979.6}, - {-10935.7, -1996.0} + {-10922.8f, -1985.2f}, + {-10916.2f, -1996.2f}, + {-10932.2f, -2008.1f}, + {-10948.8f, -2022.1f}, + {-10958.7f, -1997.7f}, + {-10971.5f, -1997.5f}, + {-10990.8f, -1995.1f}, + {-10989.8f, -1976.5f}, + {-10971.6f, -1973.0f}, + {-10955.5f, -1974.0f}, + {-10939.6f, -1969.8f}, + {-10958.0f, -1952.2f}, + {-10941.7f, -1954.8f}, + {-10943.1f, -1988.5f}, + {-10948.8f, -2005.1f}, + {-10984.0f, -2019.3f}, + {-10932.8f, -1979.6f}, + {-10935.7f, -1996.0f} }; #define TOTAL_INFERNAL_POINTS 18 diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 2dc40e931cc..f95437dd83b 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -94,7 +94,7 @@ void SummonCroneIfReady(InstanceScript* pInstance, Creature* pCreature) if (pInstance->GetData(DATA_OPERA_OZ_DEATHCOUNT) == 4) { - if (Creature* pCrone = pCreature->SummonCreature(CREATURE_CRONE, -10891.96, -1755.95, pCreature->GetPositionZ(), 4.64, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS)) + if (Creature* pCrone = pCreature->SummonCreature(CREATURE_CRONE, -10891.96f, -1755.95f, pCreature->GetPositionZ(), 4.64f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS)) { if (pCreature->getVictim()) pCrone->AI()->AttackStart(pCreature->getVictim()); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 852de18bb75..01945df877e 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -98,9 +98,9 @@ float Spawns[6][2]= #define SPELL_SPOTLIGHT 25824 #define SPELL_TUXEDO 32616 -#define SPAWN_Z 90.5 +#define SPAWN_Z 90.5f #define SPAWN_Y -1758 -#define SPAWN_O 4.738 +#define SPAWN_O 4.738f class npc_barnes : public CreatureScript { @@ -460,8 +460,8 @@ public: #define SPELL_CONFLAGRATION_BLAST 30977 #define SPELL_MANA_SHIELD 31635 -static float MedivPos[4] = {-11161.49,-1902.24,91.48,1.94}; -static float ArcanagosPos[4] = {-11169.75,-1881.48,95.39,4.83}; +static float MedivPos[4] = {-11161.49f,-1902.24f,91.48f,1.94f}; +static float ArcanagosPos[4] = {-11169.75f,-1881.48f,95.39f,4.83f}; class npc_image_of_medivh : public CreatureScript { @@ -582,7 +582,7 @@ public: CAST_CRE(arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_8, LANG_UNIVERSAL, NULL); return 5000; case 12: - arca->GetMotionMaster()->MovePoint(0, -11010.82,-1761.18, 156.47); + arca->GetMotionMaster()->MovePoint(0, -11010.82f,-1761.18f, 156.47f); arca->setActive(true); arca->InterruptNonMeleeSpells(true); arca->SetSpeed(MOVE_FLIGHT, 2.0f); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 505f0f1db6c..56117dd4733 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -70,12 +70,12 @@ EndScriptData */ /** Locations **/ float KaelLocations[3][2]= { - {148.744659, 181.377426}, - {140.823883, 195.403046}, - {156.574188, 195.650482}, + {148.744659f, 181.377426f}, + {140.823883f, 195.403046f}, + {156.574188f, 195.650482f}, }; -#define LOCATION_Z -16.727455 +#define LOCATION_Z -16.727455f class boss_felblood_kaelthas : public CreatureScript { @@ -175,7 +175,7 @@ public: void MoveInLineOfSight(Unit *who) { - if (!HasTaunted && me->IsWithinDistInMap(who, 40.0)) + if (!HasTaunted && me->IsWithinDistInMap(who, 40.0f)) { DoScriptText(SAY_AGGRO, me); HasTaunted = true; @@ -334,7 +334,7 @@ public: } else FlameStrikeTimer -= diff; // Below 50% - if (me->GetMaxHealth() * 0.5 > me->GetHealth()) + if (me->GetMaxHealth() * 0.5f > me->GetHealth()) { me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_INTERRUPT_CAST, true); me->StopMoving(); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 09811fd73f8..c4c63c038a0 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -64,15 +64,15 @@ enum eEnums MAX_ACTIVE_LACKEY = 4 }; -const float fOrientation = 4.98; -const float fZLocation = -19.921; +const float fOrientation = 4.98f; +const float fZLocation = -19.921f; float LackeyLocations[4][2]= { - {123.77, 17.6007}, - {131.731, 15.0827}, - {121.563, 15.6213}, - {129.988, 17.2355}, + {123.77f, 17.6007f}, + {131.731f, 15.0827f}, + {121.563f, 15.6213f}, + {129.988f, 17.2355f}, }; const uint32 m_auiAddEntries[] = diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp index 43d5876c1d9..0172c302a40 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp @@ -41,7 +41,7 @@ enum eEnums POINT_ID_LAND = 1 }; -const float afKaelLandPoint[] = {225.045, -276.236, -5.434}; +const float afKaelLandPoint[] = {225.045f, -276.236f, -5.434f}; #define GOSSIP_ITEM_KAEL_1 "Who are you?" #define GOSSIP_ITEM_KAEL_2 "What can we do to assist you?" diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 47e13c07e3d..5eaa74a5211 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -957,34 +957,34 @@ public: void InitWaypoint() { - AddWaypoint(1, 2389.03, -5902.74, 109.014, 5000); - AddWaypoint(2, 2341.812012, -5900.484863, 102.619743); - AddWaypoint(3, 2306.561279, -5901.738281, 91.792419); - AddWaypoint(4, 2300.098389, -5912.618652, 86.014885); - AddWaypoint(5, 2294.142090, -5927.274414, 75.316849); - AddWaypoint(6, 2286.984375, -5944.955566, 63.714966); - AddWaypoint(7, 2280.001709, -5961.186035, 54.228283); - AddWaypoint(8, 2259.389648, -5974.197754, 42.359348); - AddWaypoint(9, 2242.882812, -5984.642578, 32.827850); - AddWaypoint(10, 2217.265625, -6028.959473, 7.675705); - AddWaypoint(11, 2202.595947, -6061.325684, 5.882018); - AddWaypoint(12, 2188.974609, -6080.866699, 3.370027); + AddWaypoint(1, 2389.03f, -5902.74f, 109.014f, 5000); + AddWaypoint(2, 2341.812012f, -5900.484863f, 102.619743f); + AddWaypoint(3, 2306.561279f, -5901.738281f, 91.792419f); + AddWaypoint(4, 2300.098389f, -5912.618652f, 86.014885f); + AddWaypoint(5, 2294.142090f, -5927.274414f, 75.316849f); + AddWaypoint(6, 2286.984375f, -5944.955566f, 63.714966f); + AddWaypoint(7, 2280.001709f, -5961.186035f, 54.228283f); + AddWaypoint(8, 2259.389648f, -5974.197754f, 42.359348f); + AddWaypoint(9, 2242.882812f, -5984.642578f, 32.827850f); + AddWaypoint(10, 2217.265625f, -6028.959473f, 7.675705f); + AddWaypoint(11, 2202.595947f, -6061.325684f, 5.882018f); + AddWaypoint(12, 2188.974609f, -6080.866699f, 3.370027f); if (urand(0,1)) { - AddWaypoint(13, 2176.483887, -6110.407227, 1.855181); - AddWaypoint(14, 2172.516602, -6146.752441, 1.074235); - AddWaypoint(15, 2138.918457, -6158.920898, 1.342926); - AddWaypoint(16, 2129.866699, -6174.107910, 4.380779); - AddWaypoint(17, 2117.709473, -6193.830078, 13.3542, 10000); + AddWaypoint(13, 2176.483887f, -6110.407227f, 1.855181f); + AddWaypoint(14, 2172.516602f, -6146.752441f, 1.074235f); + AddWaypoint(15, 2138.918457f, -6158.920898f, 1.342926f); + AddWaypoint(16, 2129.866699f, -6174.107910f, 4.380779f); + AddWaypoint(17, 2117.709473f, -6193.830078f, 13.3542f, 10000); } else { - AddWaypoint(13, 2184.190186, -6166.447266, 0.968877); - AddWaypoint(14, 2234.265625, -6163.741211, 0.916021); - AddWaypoint(15, 2268.071777, -6158.750977, 1.822252); - AddWaypoint(16, 2270.028320, -6176.505859, 6.340538); - AddWaypoint(17, 2271.739014, -6195.401855, 13.3542, 10000); + AddWaypoint(13, 2184.190186f, -6166.447266f, 0.968877f); + AddWaypoint(14, 2234.265625f, -6163.741211f, 0.916021f); + AddWaypoint(15, 2268.071777f, -6158.750977f, 1.822252f); + AddWaypoint(16, 2270.028320f, -6176.505859f, 6.340538f); + AddWaypoint(17, 2271.739014f, -6195.401855f, 13.3542f, 10000); } } @@ -1073,7 +1073,7 @@ public: if (pPlayer->GetQuestStatus(12701) == QUEST_STATUS_INCOMPLETE) { // Hack Why Trinity Dont Support Custom Summon Location - if (Creature *miner = pPlayer->SummonCreature(28841, 2383.869629, -5900.312500, 107.996086, pPlayer->GetOrientation(),TEMPSUMMON_DEAD_DESPAWN, 1)) + if (Creature *miner = pPlayer->SummonCreature(28841, 2383.869629f, -5900.312500f, 107.996086f, pPlayer->GetOrientation(),TEMPSUMMON_DEAD_DESPAWN, 1)) { pPlayer->CastSpell(pPlayer, SPELL_CART_SUMM, true); if (Creature *car = pPlayer->GetVehicleCreatureBase()) diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 98193741d77..cad8e009c8c 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -271,7 +271,7 @@ public: void SummonAcolyte(uint32 uiAmount) { for (uint32 i = 0; i < uiAmount; ++i) - me->SummonCreature(NPC_CRIMSON_ACOLYTE, 1642.329, -6045.818, 127.583, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_CRIMSON_ACOLYTE, 1642.329f, -6045.818f, 127.583f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); } void UpdateAI(const uint32 uiDiff) @@ -301,7 +301,7 @@ public: break; case 3: DoScriptText(SAY_BREAKOUT6, me); - me->SummonCreature(NPC_HIGH_INQUISITOR_VALROTH, 1642.329, -6045.818, 127.583, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); + me->SummonCreature(NPC_HIGH_INQUISITOR_VALROTH, 1642.329f, -6045.818f, 127.583f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); m_uiWave_Timer = 1000; break; case 4: diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index 25d82a2b9c2..2ae6512fcdb 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -251,36 +251,36 @@ void UpdateWorldState(Map *map, uint32 id, uint32 state) static Locations LightofDawnLoc[]= { - {2281.335, -5300.409, 85.170, 0}, // 0 Tirion Fordring loc - {2283.896, -5287.914, 83.066, 1.55}, // 1 Tirion Fordring loc2 - {2281.461, -5263.014, 81.164, 0}, // 2 Tirion charges - {2262.277, -5293.477, 82.167, 0}, // 3 Tirion run - {2270.286, -5287.73, 82.262, 0}, // 4 Tirion relocate - {2269.511, -5288.289, 82.225, 0}, // 5 Tirion forward - {2262.277, -5293.477, 82.167, 0}, // 6 Tirion runs to Darion - {2270.286, -5287.73, 82.262, 0}, - {2269.511, -5288.289, 82.225, 0}, - {2273.205, -5288.848, 82.617, 0}, // 9 Korfax loc1 - {2274.739, -5287.926, 82.684, 0}, // 10 Korfax loc2 - {2253.673, -5318.004, 81.724, 0}, // 11 Korfax kicked - {2287.028, -5309.644, 87.253, 0}, // 12 Maxwell loc1 - {2286.978, -5308.025, 86.83, 0}, // 13 Maxwell loc2 - {2248.877, -5307.586, 82.166, 0}, // 14 maxwell kicked - {2278.58, -5316.933, 88.319, 0}, // 15 Eligor loc1 - {2278.535, -5315.479, 88.08, 0}, // 16 Eligor loc2 - {2259.416, -5304.505, 82.149, 0}, // 17 eligor kicked - {2289.259, -5280.355, 82.112, 0}, // 18 Koltira loc1 - {2289.02, -5281.985, 82.207, 0}, // 19 Koltira loc2 - {2273.289, -5273.675, 81.701, 0}, // 20 Thassarian loc1 - {2273.332, -5275.544, 81.849, 0}, // 21 Thassarian loc2 - {2281.198, -5257.397, 80.224, 4.66}, // 22 Alexandros loc1 - {2281.156, -5259.934, 80.647, 0}, // 23 Alexandros loc2 - {2281.294, -5281.895, 82.445, 1.35}, // 24 Darion loc1 - {2281.093, -5263.013, 81.125, 0}, // 25 Darion loc1 - {2281.313, -5250.282, 79.322, 4.69}, // 26 Lich King spawns - {2281.523, -5261.058, 80.877, 0}, // 27 Lich king move forwards - {2272.709, -5255.552, 78.226, 0}, // 28 Lich king kicked - {2273.972, -5257.676, 78.862, 0} // 29 Lich king moves forward + {2281.335f, -5300.409f, 85.170f, 0}, // 0 Tirion Fordring loc + {2283.896f, -5287.914f, 83.066f, 1.55f}, // 1 Tirion Fordring loc2 + {2281.461f, -5263.014f, 81.164f, 0}, // 2 Tirion charges + {2262.277f, -5293.477f, 82.167f, 0}, // 3 Tirion run + {2270.286f, -5287.73f, 82.262f, 0}, // 4 Tirion relocate + {2269.511f, -5288.289f, 82.225f, 0}, // 5 Tirion forward + {2262.277f, -5293.477f, 82.167f, 0}, // 6 Tirion runs to Darion + {2270.286f, -5287.73f, 82.262f, 0}, + {2269.511f, -5288.289f, 82.225f, 0}, + {2273.205f, -5288.848f, 82.617f, 0}, // 9 Korfax loc1 + {2274.739f, -5287.926f, 82.684f, 0}, // 10 Korfax loc2 + {2253.673f, -5318.004f, 81.724f, 0}, // 11 Korfax kicked + {2287.028f, -5309.644f, 87.253f, 0}, // 12 Maxwell loc1 + {2286.978f, -5308.025f, 86.83f, 0}, // 13 Maxwell loc2 + {2248.877f, -5307.586f, 82.166f, 0}, // 14 maxwell kicked + {2278.58f, -5316.933f, 88.319f, 0}, // 15 Eligor loc1 + {2278.535f, -5315.479f, 88.08f, 0}, // 16 Eligor loc2 + {2259.416f, -5304.505f, 82.149f, 0}, // 17 eligor kicked + {2289.259f, -5280.355f, 82.112f, 0}, // 18 Koltira loc1 + {2289.02f, -5281.985f, 82.207f, 0}, // 19 Koltira loc2 + {2273.289f, -5273.675f, 81.701f, 0}, // 20 Thassarian loc1 + {2273.332f, -5275.544f, 81.849f, 0}, // 21 Thassarian loc2 + {2281.198f, -5257.397f, 80.224f, 4.66f}, // 22 Alexandros loc1 + {2281.156f, -5259.934f, 80.647f, 0}, // 23 Alexandros loc2 + {2281.294f, -5281.895f, 82.445f, 1.35f}, // 24 Darion loc1 + {2281.093f, -5263.013f, 81.125f, 0}, // 25 Darion loc1 + {2281.313f, -5250.282f, 79.322f, 4.69f}, // 26 Lich King spawns + {2281.523f, -5261.058f, 80.877f, 0}, // 27 Lich king move forwards + {2272.709f, -5255.552f, 78.226f, 0}, // 28 Lich king kicked + {2273.972f, -5257.676f, 78.862f, 0} // 29 Lich king moves forward }; class npc_highlord_darion_mograine : public CreatureScript @@ -1133,7 +1133,7 @@ public: case 48: // Show the cleansing effect (dawn of light) //if (GameObject* pGo = me->GetMap()->GetGameObject(uiDawnofLightGUID)) // pGo->SetPhaseMask(128, true); - me->SummonGameObject(GO_LIGHT_OF_DAWN, 2283.896, -5287.914, 83.066, 0, 0, 0, 0, 0, 30000); + me->SummonGameObject(GO_LIGHT_OF_DAWN, 2283.896f, -5287.914f, 83.066f, 0, 0, 0, 0, 0, 30000); if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) { if (pTemp->HasAura(SPELL_REBIRTH_OF_THE_ASHBRINGER, 0)) @@ -1411,7 +1411,7 @@ public: if (uiFight_duration <= diff + 5000) { if (!uiTirionGUID) - if (Unit* pTemp = me->SummonCreature(NPC_HIGHLORD_TIRION_FORDRING, LightofDawnLoc[0].x, LightofDawnLoc[0].y, LightofDawnLoc[0].z, 1.528, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000)) + if (Unit* pTemp = me->SummonCreature(NPC_HIGHLORD_TIRION_FORDRING, LightofDawnLoc[0].x, LightofDawnLoc[0].y, LightofDawnLoc[0].z, 1.528f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000)) { pTemp->setFaction(me->getFaction()); pTemp->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 0, uint32(EQUIP_UNEQUIP)); 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(); 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); } } diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 89d6979e084..b2a893971dd 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -48,11 +48,11 @@ enum eEnums const Position SpawnLocation[] = { - {-148.199,2165.647,128.448,1.026}, - {-153.110,2168.620,128.448,1.026}, - {-145.905,2180.520,128.448,4.183}, - {-140.794,2178.037,128.448,4.090}, - {-138.640,2170.159,136.577,2.737} + {-148.199f,2165.647f,128.448f,1.026f}, + {-153.110f,2168.620f,128.448f,1.026f}, + {-145.905f,2180.520f,128.448f,4.183f}, + {-140.794f,2178.037f,128.448f,4.090f}, + {-138.640f,2170.159f,136.577f,2.737f} }; class instance_shadowfang_keep : public InstanceMapScript { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp index 845c61afa39..b0587250154 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp @@ -33,35 +33,35 @@ EndScriptData */ #define SAY_4 "So you see fit to toy with the Lich King's creations? Ramstein, be sure to give the intruders a proper greeting." #define SAY_5 "Time to take matters into my own hands. Come. Enter my domain and challenge the might of the Scourge!" -#define ADD_1X 4017.403809 -#define ADD_1Y -3339.703369 -#define ADD_1Z 115.057655 -#define ADD_1O 5.487860 - -#define ADD_2X 4013.189209 -#define ADD_2Y -3351.808350 -#define ADD_2Z 115.052254 -#define ADD_2O 0.134280 - -#define ADD_3X 4017.738037 -#define ADD_3Y -3363.478016 -#define ADD_3Z 115.057274 -#define ADD_3O 0.723313 - -#define ADD_4X 4048.877197 -#define ADD_4Y -3363.223633 -#define ADD_4Z 115.054253 -#define ADD_4O 3.627735 - -#define ADD_5X 4051.777588 -#define ADD_5Y -3350.893311 -#define ADD_5Z 115.055351 -#define ADD_5O 3.066176 - -#define ADD_6X 4048.375977 -#define ADD_6Y -3339.966309 -#define ADD_6Z 115.055222 -#define ADD_6O 2.457497 +#define ADD_1X 4017.403809f +#define ADD_1Y -3339.703369f +#define ADD_1Z 115.057655f +#define ADD_1O 5.487860f + +#define ADD_2X 4013.189209f +#define ADD_2Y -3351.808350f +#define ADD_2Z 115.052254f +#define ADD_2O 0.134280f + +#define ADD_3X 4017.738037f +#define ADD_3Y -3363.478016f +#define ADD_3Z 115.057274f +#define ADD_3O 0.723313f + +#define ADD_4X 4048.877197f +#define ADD_4Y -3363.223633f +#define ADD_4Z 115.054253f +#define ADD_4O 3.627735f + +#define ADD_5X 4051.777588f +#define ADD_5Y -3350.893311f +#define ADD_5Z 115.055351f +#define ADD_5O 3.066176f + +#define ADD_6X 4048.375977f +#define ADD_6Y -3339.966309f +#define ADD_6Z 115.055222f +#define ADD_6O 2.457497f #define SPELL_SHADOWBOLT 17393 #define SPELL_CLEAVE 15284 diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp index 151a26d1a09..280e4a57d0c 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp @@ -26,50 +26,50 @@ EndScriptData */ #include "ScriptPCH.h" //front, left -#define ADD_1X 3553.851807 -#define ADD_1Y -2945.885986 -#define ADD_1Z 125.001015 -#define ADD_1O 0.592007 +#define ADD_1X 3553.851807f +#define ADD_1Y -2945.885986f +#define ADD_1Z 125.001015f +#define ADD_1O 0.592007f //front, right -#define ADD_2X 3559.206299 -#define ADD_2Y -2952.929932 -#define ADD_2Z 125.001015 -#define ADD_2O 0.592007 +#define ADD_2X 3559.206299f +#define ADD_2Y -2952.929932f +#define ADD_2Z 125.001015f +#define ADD_2O 0.592007f //mid, left -#define ADD_3X 3552.417480 -#define ADD_3Y -2948.667236 -#define ADD_3Z 125.001015 -#define ADD_3O 0.592007 +#define ADD_3X 3552.417480f +#define ADD_3Y -2948.667236f +#define ADD_3Z 125.001015f +#define ADD_3O 0.592007f //mid, right -#define ADD_4X 3555.651855 -#define ADD_4Y -2953.519043 -#define ADD_4Z 125.001015 -#define ADD_4O 0.592007 +#define ADD_4X 3555.651855f +#define ADD_4Y -2953.519043f +#define ADD_4Z 125.001015f +#define ADD_4O 0.592007f //back, left -#define ADD_5X 3547.927246 -#define ADD_5Y -2950.977295 -#define ADD_5Z 125.001015 -#define ADD_5O 0.592007 +#define ADD_5X 3547.927246f +#define ADD_5Y -2950.977295f +#define ADD_5Z 125.001015f +#define ADD_5O 0.592007f //back, mid -#define ADD_6X 3553.094697 -#define ADD_6Y -2952.123291 -#define ADD_6Z 125.001015 -#define ADD_6O 0.592007 +#define ADD_6X 3553.094697f +#define ADD_6Y -2952.123291f +#define ADD_6Z 125.001015f +#define ADD_6O 0.592007f //back, right -#define ADD_7X 3552.727539 -#define ADD_7Y -2957.776123 -#define ADD_7Z 125.001015 -#define ADD_7O 0.592007 +#define ADD_7X 3552.727539f +#define ADD_7Y -2957.776123f +#define ADD_7Z 125.001015f +#define ADD_7O 0.592007f //behind, left -#define ADD_8X 3547.156250 -#define ADD_8Y -2953.162354 -#define ADD_8Z 125.001015 -#define ADD_8O 0.592007 +#define ADD_8X 3547.156250f +#define ADD_8Y -2953.162354f +#define ADD_8Z 125.001015f +#define ADD_8O 0.592007f //behind, right -#define ADD_9X 3550.202148 -#define ADD_9Y -2957.437744 -#define ADD_9Z 125.001015 -#define ADD_9O 0.592007 +#define ADD_9X 3550.202148f +#define ADD_9Y -2957.437744f +#define ADD_9Z 125.001015f +#define ADD_9O 0.592007f #define SPELL_KNOCKAWAY 10101 #define SPELL_PUMMEL 15615 diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp index 733fcb8e717..baf040dbaa4 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp @@ -54,15 +54,15 @@ struct SummonDef SummonDef m_aSummonPoint[]= { - {3444.156, -3090.626, 135.002, 2.240}, //G1 front, left - {3449.123, -3087.009, 135.002, 2.240}, //G1 front, right - {3446.246, -3093.466, 135.002, 2.240}, //G1 back left - {3451.160, -3089.904, 135.002, 2.240}, //G1 back, right - - {3457.995, -3080.916, 135.002, 3.784}, //G2 front, left - {3454.302, -3076.330, 135.002, 3.784}, //G2 front, right - {3460.975, -3078.901, 135.002, 3.784}, //G2 back left - {3457.338, -3073.979, 135.002, 3.784} //G2 back, right + {3444.156f, -3090.626f, 135.002f, 2.240f}, //G1 front, left + {3449.123f, -3087.009f, 135.002f, 2.240f}, //G1 front, right + {3446.246f, -3093.466f, 135.002f, 2.240f}, //G1 back left + {3451.160f, -3089.904f, 135.002f, 2.240f}, //G1 back, right + + {3457.995f, -3080.916f, 135.002f, 3.784f}, //G2 front, left + {3454.302f, -3076.330f, 135.002f, 3.784f}, //G2 front, right + {3460.975f, -3078.901f, 135.002f, 3.784f}, //G2 back left + {3457.338f, -3073.979f, 135.002f, 3.784f} //G2 back, right }; class boss_dathrohan_balnazzar : public CreatureScript diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp index 51f599d9167..7915cb19000 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp @@ -67,7 +67,7 @@ public: { for (uint8 i = 0; i < 30; ++i) { - if (Creature* mob = me->SummonCreature(C_MINDLESS_UNDEAD,3969.35+irand(-10,10),-3391.87+irand(-10,10),119.11,5.91,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000)) + if (Creature* mob = me->SummonCreature(C_MINDLESS_UNDEAD,3969.35f+irand(-10,10),-3391.87f+irand(-10,10),119.11f,5.91f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000)) mob->AI()->AttackStart(me->SelectNearestTarget(500)); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index 4e55821ee4f..6aa5840b109 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -277,7 +277,7 @@ public: //a bit itchy, it should close the door after 10 secs, but it doesn't. skipping it for now. //UpdateGoState(ziggurat4GUID,0,true); if (Creature* pBaron = instance->GetCreature(baronGUID)) - pBaron->SummonCreature(C_RAMSTEIN,4032.84,-3390.24,119.73,4.71,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000); + pBaron->SummonCreature(C_RAMSTEIN,4032.84f,-3390.24f,119.73f,4.71f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000); sLog.outDebug("TSCR: Instance Stratholme: Ramstein spawned."); } else @@ -442,7 +442,7 @@ public: if (Creature* pBaron = instance->GetCreature(baronGUID)) { for (uint8 i = 0; i < 4; ++i) - pBaron->SummonCreature(C_BLACK_GUARD,4032.84,-3390.24,119.73,4.71,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000); + pBaron->SummonCreature(C_BLACK_GUARD,4032.84f,-3390.24f,119.73f,4.71f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000); HandleGameObject(ziggurat4GUID, true); HandleGameObject(ziggurat5GUID, true); diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp index 7f230050777..d399e77ca81 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp @@ -44,7 +44,7 @@ public: if (InstanceScript* pInstance = pPlayer->GetInstanceScript()) { if (!pPlayer->FindNearestCreature(15362,15)) - pPlayer->SummonCreature(15362, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), -1.52, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000); + pPlayer->SummonCreature(15362, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), -1.52f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000); return false; } return false; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index dc0c0ffc72c..a81c607e754 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -256,7 +256,7 @@ public: me->CastStop(SPELL_FOG_BREATH); me->RemoveAurasDueToSpell(SPELL_FOG_BREATH); me->SetUnitMovementFlags(MOVEMENTFLAG_NONE); - me->SetSpeed(MOVE_RUN, 2.0); + me->SetSpeed(MOVE_RUN, 2.0f); events.ScheduleEvent(EVENT_CLEAVE, urand(5000, 10000)); events.ScheduleEvent(EVENT_CORROSION, urand(10000, 20000)); @@ -535,7 +535,7 @@ public: mob_felmyst_vaporAI(Creature *c) : ScriptedAI(c) { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->SetSpeed(MOVE_RUN, 0.8); + me->SetSpeed(MOVE_RUN, 0.8f); } void Reset() {} void EnterCombat(Unit* /*who*/) @@ -570,7 +570,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); DoCast(me, SPELL_TRAIL_TRIGGER, true); me->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); - me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 0.01); // core bug + me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 0.01f); // core bug } void Reset() {} void EnterCombat(Unit* /*who*/) {} diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 7dbb46ea270..78051871384 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -96,8 +96,8 @@ enum SWPActions #define CENTER_Y 930 #define RADIUS 30 -#define DRAGON_REALM_Z 53.079 -#define DEMON_REALM_Z -74.558 +#define DRAGON_REALM_Z 53.079f +#define DEMON_REALM_Z -74.558f #define MAX_PLAYERS_IN_SPECTRAL_REALM 0 //over this, teleport object won't work, 0 disables check diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index d123436d8cd..9a0ce4cca45 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -90,7 +90,7 @@ enum Spells SPELL_REBIRTH = 44200, // Emerge from the Sunwell SPELL_SOUL_FLAY = 45442, // 9k Shadow damage over 3 seconds. Spammed throughout all the fight. SPELL_SOUL_FLAY_SLOW = 47106, - SPELL_LEGION_LIGHTNING = 45664, // Chain Lightning, 4 targets, ~3k Shadow damage, 1.5k mana burn + SPELL_LEGION_LIGHTNING = 45664, // Chain Lightning, 4 targets, ~3k Shadow damage, 1.5fk mana burn SPELL_FIRE_BLOOM = 45641, // Places a debuff on 5 raid members, which causes them to deal 2k Fire damage to nearby allies and selves. MIGHT NOT WORK SPELL_DESTROY_ALL_DRAKES = 46707, // when he use it? @@ -157,8 +157,8 @@ enum Spells #define ERROR_KJ_NOT_SUMMONED "TSCR ERROR: Unable to summon Kil'Jaeden for some reason" /*** Others ***/ -#define FLOOR_Z 28.050388 -#define SHIELD_ORB_Z 45.000 +#define FLOOR_Z 28.050388f +#define SHIELD_ORB_Z 45.000f enum Phase { @@ -193,18 +193,18 @@ enum KilJaedenTimers // Locations of the Hand of Deceiver adds Position DeceiverLocations[3]= { - {1682.045, 631.299, 5.936}, - {1684.099, 618.848, 0.589}, - {1694.170, 612.272, 1.416}, + {1682.045f, 631.299f, 5.936f}, + {1684.099f, 618.848f, 0.589f}, + {1694.170f, 612.272f, 1.416f}, }; // Locations, where Shield Orbs will spawn float ShieldOrbLocations[4][2]= { - {1698.900, 627.870}, // middle pont of Sunwell - {12, 3.14}, // First one spawns northeast of KJ - {12, 3.14/0.7}, // Second one spawns southeast - {12, 3.14*3.8} // Third one spawns (?) + {1698.900f, 627.870f}, // middle pont of Sunwell + {12, 3.14f}, // First one spawns northeast of KJ + {12, 3.14f/0.7f}, // Second one spawns southeast + {12, 3.14f*3.8f} // Third one spawns (?) }; struct Speech diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index e8fd7445795..2fdc3d3b843 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -80,24 +80,24 @@ enum BossTimers{ float DarkFiends[8][4] = { - {1819.9, 609.80, 69.74, 1.94}, - {1829.39, 617.89, 69.73, 2.61}, - {1801.98, 633.62, 69.74, 5.71}, - {1830.88, 629.99, 69.73, 3.52}, - {1800.38, 621.41, 69.74, 0.22}, - {1808.3 , 612.45, 69.73, 1.02}, - {1823.9 , 639.69, 69.74, 4.12}, - {1811.85, 640.46, 69.73, 4.97} + {1819.9f, 609.80f, 69.74f, 1.94f}, + {1829.39f, 617.89f, 69.73f, 2.61f}, + {1801.98f, 633.62f, 69.74f, 5.71f}, + {1830.88f, 629.99f, 69.73f, 3.52f}, + {1800.38f, 621.41f, 69.74f, 0.22f}, + {1808.3f , 612.45f, 69.73f, 1.02f}, + {1823.9f , 639.69f, 69.74f, 4.12f}, + {1811.85f, 640.46f, 69.73f, 4.97f} }; float Humanoides[6][5] = { - {CREATURE_FURY_MAGE, 1780.16, 666.83, 71.19, 5.21}, - {CREATURE_FURY_MAGE, 1847.93, 600.30, 71.30, 2.57}, - {CREATURE_BERSERKER, 1779.97, 660.64, 71.19, 5.28}, - {CREATURE_BERSERKER, 1786.2 , 661.01, 71.19, 4.51}, - {CREATURE_BERSERKER, 1845.17, 602.63, 71.28, 2.43}, - {CREATURE_BERSERKER, 1842.91, 599.93, 71.23, 2.44} + {CREATURE_FURY_MAGE, 1780.16f, 666.83f, 71.19f, 5.21f}, + {CREATURE_FURY_MAGE, 1847.93f, 600.30f, 71.30f, 2.57f}, + {CREATURE_BERSERKER, 1779.97f, 660.64f, 71.19f, 5.28f}, + {CREATURE_BERSERKER, 1786.2f , 661.01f, 71.19f, 4.51f}, + {CREATURE_BERSERKER, 1845.17f, 602.63f, 71.28f, 2.43f}, + {CREATURE_BERSERKER, 1842.91f, 599.93f, 71.23f, 2.44f} }; uint32 EnrageTimer = 600000; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 0b026ce826d..2e7598284d3 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -96,11 +96,11 @@ EndScriptData */ #define SPELL_WR_WHIRLWIND 43442 #define SPELL_WR_MORTAL_STRIKE 43441 -#define ORIENT 1.5696 -#define POS_Y 921.2795 -#define POS_Z 33.8883 +#define ORIENT 1.5696f +#define POS_Y 921.2795f +#define POS_Z 33.8883f -static float Pos_X[4] = {112.8827, 107.8827, 122.8827, 127.8827}; +static float Pos_X[4] = {112.8827f, 107.8827f, 122.8827f, 127.8827f}; static uint32 AddEntryList[8]= { @@ -348,7 +348,7 @@ class boss_hexlord_malacrass : public CreatureScript if (ResetTimer <= diff) { - if (me->IsWithinDist3d(119.223, 1035.45, 29.4481, 10)) + if (me->IsWithinDist3d(119.223f, 1035.45f, 29.4481f, 10)) { EnterEvadeMode(); return; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 3604a5d3678..e5a98ee686d 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -73,32 +73,32 @@ const int area_dy = 51; float JanalainPos[1][3] = { - {-33.93, 1149.27, 19} + {-33.93f, 1149.27f, 19} }; float FireWallCoords[4][4] = { - {-10.13, 1149.27, 19, 3.1415}, - {-33.93, 1123.90, 19, 0.5*3.1415}, - {-54.80, 1150.08, 19, 0}, - {-33.93, 1175.68, 19, 1.5*3.1415} + {-10.13f, 1149.27f, 19, 3.1415f}, + {-33.93f, 1123.90f, 19, 0.5f*3.1415f}, + {-54.80f, 1150.08f, 19, 0}, + {-33.93f, 1175.68f, 19, 1.5f*3.1415f} }; float hatcherway[2][5][3] = { { - {-87.46,1170.09,6}, - {-74.41,1154.75,6}, - {-52.74,1153.32,19}, - {-33.37,1172.46,19}, - {-33.09,1203.87,19} + {-87.46f,1170.09f,6}, + {-74.41f,1154.75f,6}, + {-52.74f,1153.32f,19}, + {-33.37f,1172.46f,19}, + {-33.09f,1203.87f,19} }, { - {-86.57,1132.85,6}, - {-73.94,1146.00,6}, - {-52.29,1146.51,19}, - {-33.57,1125.72,19}, - {-34.29,1095.22,19} + {-86.57f,1132.85f,6}, + {-73.94f,1146.00f,6}, + {-52.29f,1146.51f,19}, + {-33.57f,1125.72f,19}, + {-34.29f,1095.22f,19} } }; class boss_janalai : public CreatureScript diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 6bcc5553e1d..6ae25708bf9 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -30,14 +30,14 @@ EndScriptData */ //Trash Waves float NalorakkWay[8][3] = { - { 18.569, 1414.512, 11.42},// waypoint 1 - {-17.264, 1419.551, 12.62}, - {-52.642, 1419.357, 27.31},// waypoint 2 - {-69.908, 1419.721, 27.31}, - {-79.929, 1395.958, 27.31}, - {-80.072, 1374.555, 40.87},// waypoint 3 - {-80.072, 1314.398, 40.87}, - {-80.072, 1295.775, 48.60} // waypoint 4 + { 18.569f, 1414.512f, 11.42f},// waypoint 1 + {-17.264f, 1419.551f, 12.62f}, + {-52.642f, 1419.357f, 27.31f},// waypoint 2 + {-69.908f, 1419.721f, 27.31f}, + {-79.929f, 1395.958f, 27.31f}, + {-80.072f, 1374.555f, 40.87f},// waypoint 3 + {-80.072f, 1314.398f, 40.87f}, + {-80.072f, 1295.775f, 48.60f} // waypoint 4 }; #define YELL_NALORAKK_WAVE1 "Get da move on, guards! It be killin' time!" @@ -317,7 +317,7 @@ class boss_nalorakk : public CreatureScript switch(MovePhase) { case 2: - me->SetOrientation(3.1415*2); + me->SetOrientation(3.1415f*2); inMove = false; return; case 1: @@ -329,11 +329,11 @@ class boss_nalorakk : public CreatureScript inMove = true; return; case 5: - me->SetOrientation(3.1415*0.5); + me->SetOrientation(3.1415f*0.5f); inMove = false; return; case 7: - me->SetOrientation(3.1415*0.5); + me->SetOrientation(3.1415f*0.5f); inMove = false; return; } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index 40eb40f6fcf..964ae32fb59 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -107,9 +107,9 @@ EndScriptData */ #define PHASE_TROLL 4 //coords for going for changing form -#define CENTER_X 120.148811 -#define CENTER_Y 703.713684 -#define CENTER_Z 45.111477 +#define CENTER_X 120.148811f +#define CENTER_Y 703.713684f +#define CENTER_Z 45.111477f struct SpiritInfoStruct { @@ -119,10 +119,10 @@ struct SpiritInfoStruct static SpiritInfoStruct SpiritInfo[] = { - {23878, 147.87, 706.51, 45.11, 3.04}, - {23880, 88.95, 705.49, 45.11, 6.11}, - {23877, 137.23, 725.98, 45.11, 3.71}, - {23879, 104.29, 726.43, 45.11, 5.43} + {23878, 147.87f, 706.51f, 45.11f, 3.04f}, + {23880, 88.95f, 705.49f, 45.11f, 6.11f}, + {23877, 137.23f, 725.98f, 45.11f, 3.71f}, + {23879, 104.29f, 726.43f, 45.11f, 5.43f} }; struct TransformStruct @@ -191,7 +191,7 @@ class boss_zuljin : public CreatureScript Phase = 0; - health_20 = me->GetMaxHealth()*0.2; + health_20 = me->GetMaxHealth()*0.2f; Intro_Timer = 37000; Berserk_Timer = 600000; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp index 58df6fb7dd4..9ff1751ffc2 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp @@ -44,10 +44,10 @@ struct SHostageInfo static SHostageInfo HostageInfo[] = { - {23790, 186648, -57, 1343, 40.77, 3.2}, // bear - {23999, 187021, 400, 1414, 74.36, 3.3}, // eagle - {24001, 186672, -35, 1134, 18.71, 1.9}, // dragonhawk - {24024, 186667, 413, 1117, 6.32, 3.1} // lynx + {23790, 186648, -57, 1343, 40.77f, 3.2f}, // bear + {23999, 187021, 400, 1414, 74.36f, 3.3f}, // eagle + {24001, 186672, -35, 1134, 18.71f, 1.9f}, // dragonhawk + {24024, 186667, 413, 1117, 6.32f, 3.1f} // lynx }; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index 28d21499e30..090e9193019 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -133,8 +133,8 @@ class boss_arlokk : public CreatureScript if (Unit *pMarkedTarget = Unit::GetUnit(*me, MarkedTargetGUID)) DoScriptText(SAY_FEAST_PANTHER, me, pMarkedTarget); - me->SummonCreature(NPC_ZULIAN_PROWLER, -11532.7998, -1649.6734, 41.4800, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - me->SummonCreature(NPC_ZULIAN_PROWLER, -11532.9970, -1606.4840, 41.2979, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + me->SummonCreature(NPC_ZULIAN_PROWLER, -11532.7998f, -1649.6734f, 41.4800f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + me->SummonCreature(NPC_ZULIAN_PROWLER, -11532.9970f, -1606.4840f, 41.2979f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); } void JustSummoned(Creature* pSummoned) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index 0c5db040b19..26c10986ad5 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -139,21 +139,21 @@ class boss_jeklik : public CreatureScript Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); Creature* Bat = NULL; - Bat = me->SummonCreature(11368,-12291.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368,-12291.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12289.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368,-12289.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12293.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368,-12293.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12291.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368,-12291.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12289.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368,-12289.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12293.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368,-12293.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); SpawnBats_Timer = 60000; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index fb72ad61abd..b4aab45f310 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -127,7 +127,7 @@ class boss_jindo : public CreatureScript pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { - DoTeleportPlayer(pTarget, -11583.7783,-1249.4278,77.5471,4.745); + DoTeleportPlayer(pTarget, -11583.7783f,-1249.4278f,77.5471f,4.745f); if (DoGetThreat(me->getVictim())) DoModifyThreatPercent(pTarget,-100); diff --git a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp index 8ded637e312..521eb24cd24 100644 --- a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp +++ b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp @@ -78,8 +78,8 @@ class npc_professor_phizzlethorpe : public CreatureScript case 8:DoScriptText(EMOTE_PROGRESS_4, me);break; case 9: { - me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96, -2142.49, 20.15, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); - me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96, -2142.49, 20.15, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); + me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96f, -2142.49f, 20.15f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); + me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96f, -2142.49f, 20.15f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); break; } case 10:DoScriptText(SAY_PROGRESS_5, me, pPlayer);break; diff --git a/src/server/scripts/EasternKingdoms/duskwood.cpp b/src/server/scripts/EasternKingdoms/duskwood.cpp index 904e1001dcf..cbc4c45b70c 100644 --- a/src/server/scripts/EasternKingdoms/duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/duskwood.cpp @@ -38,7 +38,7 @@ public: { if (pPlayer->HasQuestForItem(21149)) { - if (Unit* TCorrupter = pPlayer->SummonCreature(15625,-10328.16,-489.57,49.95,0,TEMPSUMMON_MANUAL_DESPAWN,60000)) + if (Unit* TCorrupter = pPlayer->SummonCreature(15625,-10328.16f,-489.57f,49.95f,0,TEMPSUMMON_MANUAL_DESPAWN,60000)) { TCorrupter->setFaction(14); TCorrupter->SetMaxHealth(832750); diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp index 997f79033fb..6dab06ff8b8 100644 --- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp @@ -166,10 +166,10 @@ struct Locations static Locations SpawnPosition[]= { - {5.3, -11.8, 0.361, 4.2}, - {11.2, -29.17, 0.361, 2.7}, - {-5.7, -34.85, 0.361, 1.09}, - {-11.9, -18, 0.361, 5.87} + {5.3f, -11.8f, 0.361f, 4.2f}, + {11.2f, -29.17f, 0.361f, 2.7f}, + {-5.7f, -34.85f, 0.361f, 1.09f}, + {-11.9f, -18, 0.361f, 5.87f} }; static uint32 PaladinEntry[] = {CHAMPION_BLOODWRATH, CHAMPION_LIGHTREND, CHAMPION_SWIFTBLADE, CHAMPION_SUNSTRIKER}; @@ -582,9 +582,9 @@ public: if (Summon) { - me->SummonCreature(MOB_GHARZUL, 8745, -7134.32, 35.22, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000); - me->SummonCreature(MOB_ANGERSHADE, 8745, -7134.32, 35.22, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000); - me->SummonCreature(MOB_ANGERSHADE, 8745, -7134.32, 35.22, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000); + me->SummonCreature(MOB_GHARZUL, 8745, -7134.32f, 35.22f, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000); + me->SummonCreature(MOB_ANGERSHADE, 8745, -7134.32f, 35.22f, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000); + me->SummonCreature(MOB_ANGERSHADE, 8745, -7134.32f, 35.22f, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000); Summon = false; } } @@ -608,14 +608,14 @@ struct Location static Location SpawnLocations[] = { - {8270.68, -7188.53, 139.619}, - {8284.27, -7187.78, 139.603}, - {8297.43, -7193.53, 139.603}, - {8303.5, -7201.96, 139.577}, - {8273.22, -7241.82, 139.382}, - {8254.89, -7222.12, 139.603}, - {8278.51, -7242.13, 139.162}, - {8267.97, -7239.17, 139.517} + {8270.68f, -7188.53f, 139.619f}, + {8284.27f, -7187.78f, 139.603f}, + {8297.43f, -7193.53f, 139.603f}, + {8303.5f, -7201.96f, 139.577f}, + {8273.22f, -7241.82f, 139.382f}, + {8254.89f, -7222.12f, 139.603f}, + {8278.51f, -7242.13f, 139.162f}, + {8267.97f, -7239.17f, 139.517f} }; class npc_infused_crystal : public CreatureScript diff --git a/src/server/scripts/EasternKingdoms/ghostlands.cpp b/src/server/scripts/EasternKingdoms/ghostlands.cpp index 01ad05afab4..a57ededd846 100644 --- a/src/server/scripts/EasternKingdoms/ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/ghostlands.cpp @@ -192,13 +192,13 @@ public: DoScriptText(SAY_PROGRESS1, me, pPlayer); case 11: DoScriptText(SAY_PROGRESS2, me, pPlayer); - me->SetOrientation(4.762841); + me->SetOrientation(4.762841f); break; case 18: { DoScriptText(SAY_PROGRESS3, me, pPlayer); - Creature* Summ1 = me->SummonCreature(16342, 7627.083984, -7532.538086, 152.128616, 1.082733, TEMPSUMMON_DEAD_DESPAWN, 0); - Creature* Summ2 = me->SummonCreature(16343, 7620.432129, -7532.550293, 152.454865, 0.827478, TEMPSUMMON_DEAD_DESPAWN, 0); + Creature* Summ1 = me->SummonCreature(16342, 7627.083984f, -7532.538086f, 152.128616f, 1.082733f, TEMPSUMMON_DEAD_DESPAWN, 0); + Creature* Summ2 = me->SummonCreature(16343, 7620.432129f, -7532.550293f, 152.454865f, 0.827478f, TEMPSUMMON_DEAD_DESPAWN, 0); if (Summ1 && Summ2) { Summ1->Attack(me, true); @@ -214,11 +214,11 @@ public: CAST_PLR(pPlayer)->GroupEventHappens(QUEST_ESCAPE_FROM_THE_CATACOMBS,me); break; case 32: - me->SetOrientation(2.978281); + me->SetOrientation(2.978281f); DoScriptText(SAY_END1, me, pPlayer); break; case 33: - me->SetOrientation(5.858011); + me->SetOrientation(5.858011f); DoScriptText(SAY_END2, me, pPlayer); Unit* CaptainHelios = me->FindNearestCreature(NPC_CAPTAIN_HELIOS, 50); if (CaptainHelios) diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/hinterlands.cpp index 519172f4820..564619afeac 100644 --- a/src/server/scripts/EasternKingdoms/hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/hinterlands.cpp @@ -178,14 +178,14 @@ struct Location Location m_afAmbushSpawn[] = { - {191.296204, -2839.329346, 107.388}, - {70.972466, -2848.674805, 109.459} + {191.296204f, -2839.329346f, 107.388f}, + {70.972466f, -2848.674805f, 109.459f} }; Location m_afAmbushMoveTo[] = { - {166.630386, -2824.780273, 108.153}, - {70.886589, -2874.335449, 116.675} + {166.630386f, -2824.780273f, 108.153f}, + {70.886589f, -2874.335449f, 116.675f} }; class npc_rinji : public CreatureScript diff --git a/src/server/scripts/EasternKingdoms/searing_gorge.cpp b/src/server/scripts/EasternKingdoms/searing_gorge.cpp index 8fcb10ad07f..bac35cf7898 100644 --- a/src/server/scripts/EasternKingdoms/searing_gorge.cpp +++ b/src/server/scripts/EasternKingdoms/searing_gorge.cpp @@ -96,7 +96,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->TeleportTo(409, 1096, -467, -104.6, 3.64); + pPlayer->TeleportTo(409, 1096, -467, -104.6f, 3.64f); } return true; diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp index 5c53badb103..2a04a2dc413 100644 --- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp @@ -211,14 +211,14 @@ static float PyrewoodSpawnPoints[3][4] = //pos_x pos_y pos_z orien //outside /* - {-400.85, 1513.64, 18.67, 0}, - {-397.32, 1514.12, 18.67, 0}, - {-397.44, 1511.09, 18.67, 0}, + {-400.85f, 1513.64f, 18.67f, 0}, + {-397.32f, 1514.12f, 18.67f, 0}, + {-397.44f, 1511.09f, 18.67f, 0}, */ //door - {-396.17, 1505.86, 19.77, 0}, - {-396.91, 1505.77, 19.77, 0}, - {-397.94, 1504.74, 19.77, 0}, + {-396.17f, 1505.86f, 19.77f, 0}, + {-396.91f, 1505.77f, 19.77f, 0}, + {-397.94f, 1504.74f, 19.77f, 0}, }; #define WAIT_SECS 6000 diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/stormwind_city.cpp index 18a1eec322a..63a7a5b7167 100644 --- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/stormwind_city.cpp @@ -360,9 +360,9 @@ public: break; case 16: SetEscortPaused(true); - if (Creature *pMarzon = me->SummonCreature(NPC_MARZON_BLADE,-8411.360352, 480.069733, 123.760895, 4.941504, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) + if (Creature *pMarzon = me->SummonCreature(NPC_MARZON_BLADE,-8411.360352f, 480.069733f, 123.760895f, 4.941504f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) { - pMarzon->GetMotionMaster()->MovePoint(0,-8408.000977, 468.611450, 123.759903); + pMarzon->GetMotionMaster()->MovePoint(0,-8408.000977f, 468.611450f, 123.759903f); MarzonGUID = pMarzon->GetGUID(); } uiTimer = 2000; diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp index eee9f156bc4..dcab41fbc9e 100644 --- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp @@ -180,7 +180,7 @@ public: if (GameObject* pTrigger = pPlayer->FindNearestGameObject(GO_TRIGGER, 30.0f)) { pTrigger->SetGoState(GO_STATE_READY); - pPlayer->SummonCreature(NPC_ULAG, 2390.26, 336.47, 40.01, 2.26, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 300000); + pPlayer->SummonCreature(NPC_ULAG, 2390.26f, 336.47f, 40.01f, 2.26f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 300000); return false; } diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/undercity.cpp index 31e67d985a9..68de91533e9 100644 --- a/src/server/scripts/EasternKingdoms/undercity.cpp +++ b/src/server/scripts/EasternKingdoms/undercity.cpp @@ -48,14 +48,14 @@ EndContentData */ float HighborneLoc[4][3]= { - {1285.41, 312.47, 0.51}, - {1286.96, 310.40, 1.00}, - {1289.66, 309.66, 1.52}, - {1292.51, 310.50, 1.99}, + {1285.41f, 312.47f, 0.51f}, + {1286.96f, 310.40f, 1.00f}, + {1289.66f, 309.66f, 1.52f}, + {1292.51f, 310.50f, 1.99f}, }; -#define HIGHBORNE_LOC_Y -61.00 -#define HIGHBORNE_LOC_Y_NEW -55.50 +#define HIGHBORNE_LOC_Y -61.00f +#define HIGHBORNE_LOC_Y_NEW -55.50f class npc_lady_sylvanas_windrunner : public CreatureScript { @@ -105,8 +105,8 @@ public: { if (Unit *pTarget = Unit::GetUnit(*summoned,targetGUID)) { - pTarget->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0,0); - pTarget->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0, 0.0f); + pTarget->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0f,0); + pTarget->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0f, 0.0f); summoned->CastSpell(pTarget, SPELL_RIBBON_OF_SOULS, false); } diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp index b3ff1bd902d..4cca9ec423a 100644 --- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp @@ -359,7 +359,7 @@ public: case 22: break; case 23: - Ughost = me->SummonCreature(NPC_GHOST_UTHER, 971.86,-1825.42 ,81.99 , 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + Ughost = me->SummonCreature(NPC_GHOST_UTHER, 971.86f,-1825.42f ,81.99f , 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); Ughost->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); DoScriptText(SAY_WP_4, Ughost, me); m_uiChatTimer = 4000; diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/westfall.cpp index 6621914d789..40460a2ed2c 100644 --- a/src/server/scripts/EasternKingdoms/westfall.cpp +++ b/src/server/scripts/EasternKingdoms/westfall.cpp @@ -113,24 +113,24 @@ public: me->HandleEmoteCommand(EMOTE_STATE_USESTANDING_NOSHEATHE); break; case 7: - me->SummonCreature(NPC_DEFIAS_RAIDER, -11450.836, 1569.755, 54.267, 4.230, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11449.697, 1569.124, 54.421, 4.206, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.237, 1568.307, 54.620, 4.206, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11450.836f, 1569.755f, 54.267f, 4.230f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11449.697f, 1569.124f, 54.421f, 4.206f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.237f, 1568.307f, 54.620f, 4.206f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 8: me->SetSheath(SHEATH_STATE_RANGED); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11450.836, 1569.755, 54.267, 4.230, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11449.697, 1569.124, 54.421, 4.206, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.237, 1568.307, 54.620, 4.206, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.037, 1570.213, 54.961, 4.283, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11450.836f, 1569.755f, 54.267f, 4.230f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11449.697f, 1569.124f, 54.421f, 4.206f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.237f, 1568.307f, 54.620f, 4.206f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.037f, 1570.213f, 54.961f, 4.283f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 9: me->SetSheath(SHEATH_STATE_RANGED); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11450.836, 1569.755, 54.267, 4.230, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11449.697, 1569.124, 54.421, 4.206, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.237, 1568.307, 54.620, 4.206, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.037, 1570.213, 54.961, 4.283, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11449.018, 1570.738, 54.828, 4.220, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11450.836f, 1569.755f, 54.267f, 4.230f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11449.697f, 1569.124f, 54.421f, 4.206f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.237f, 1568.307f, 54.620f, 4.206f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.037f, 1570.213f, 54.961f, 4.283f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11449.018f, 1570.738f, 54.828f, 4.220f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 10: SetRun(false); |