Skip to content

Commit ff855d9

Browse files
author
NoFantasy
committed
[1572] Correct most 'double' to 'float' compile warnings.
Correct most 'double' to 'float' compile warnings. git-svn-id: https://scriptdev2.svn.sourceforge.net/svnroot/scriptdev2@1572 5f9c896b-1e26-0410-94da-f77f675e2462
1 parent 5a6e74e commit ff855d9

86 files changed

Lines changed: 753 additions & 753 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎scripts/eastern_kingdoms/arathi_highlands.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ struct MANGOS_DLL_DECL npc_professor_phizzlethorpeAI : public npc_escortAI
6868
case 5: DoScriptText(SAY_PROGRESS_3, m_creature, pPlayer); break;
6969
case 8: DoScriptText(EMOTE_PROGRESS_4, m_creature); break;
7070
case 9:
71-
m_creature->SummonCreature(ENTRY_VENGEFUL_SURGE, -2056.41, -2144.01, 20.59, 5.70, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000);
72-
m_creature->SummonCreature(ENTRY_VENGEFUL_SURGE, -2050.17, -2140.02, 19.54, 5.17, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000);
71+
m_creature->SummonCreature(ENTRY_VENGEFUL_SURGE, -2056.41f, -2144.01f, 20.59f, 5.70f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000);
72+
m_creature->SummonCreature(ENTRY_VENGEFUL_SURGE, -2050.17f, -2140.02f, 19.54f, 5.17f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000);
7373
break;
7474
case 10: DoScriptText(SAY_PROGRESS_5, m_creature, pPlayer); break;
7575
case 11:

‎scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ bool AreaTrigger_at_ring_of_law(Player* pPlayer, AreaTriggerEntry *at)
9191
return false;
9292

9393
pInstance->SetData(TYPE_RING_OF_LAW,IN_PROGRESS);
94-
pPlayer->SummonCreature(NPC_GRIMSTONE,625.559,-205.618,-52.735,2.609,TEMPSUMMON_DEAD_DESPAWN,0);
94+
pPlayer->SummonCreature(NPC_GRIMSTONE,625.559f, -205.618f, -52.735f, 2.609f, TEMPSUMMON_DEAD_DESPAWN, 0);
9595

9696
return false;
9797
}
@@ -155,7 +155,7 @@ struct MANGOS_DLL_DECL npc_grimstoneAI : public npc_escortAI
155155
//TODO: move them to center
156156
void SummonRingMob()
157157
{
158-
if (Creature* tmp = m_creature->SummonCreature(RingMob[MobSpawnId],608.960,-235.322,-53.907,1.857,TEMPSUMMON_DEAD_DESPAWN,0))
158+
if (Creature* tmp = m_creature->SummonCreature(RingMob[MobSpawnId], 608.960f, -235.322f, -53.907f, 1.857f, TEMPSUMMON_DEAD_DESPAWN,0))
159159
RingMobGUID[MobCount] = tmp->GetGUID();
160160

161161
++MobCount;
@@ -167,7 +167,7 @@ struct MANGOS_DLL_DECL npc_grimstoneAI : public npc_escortAI
167167
//TODO: move them to center
168168
void SummonRingBoss()
169169
{
170-
if (Creature* tmp = m_creature->SummonCreature(RingBoss[rand()%6],644.300,-175.989,-53.739,3.418,TEMPSUMMON_DEAD_DESPAWN,0))
170+
if (Creature* tmp = m_creature->SummonCreature(RingBoss[rand()%6], 644.300f, -175.989f, -53.739f, 3.418f, TEMPSUMMON_DEAD_DESPAWN,0))
171171
RingBossGUID = tmp->GetGUID();
172172

173173
MobDeath_Timer = 2500;

‎scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ EndScriptData */
2626
#define SPELL_CROWDPUMMEL 10887
2727
#define SPELL_MIGHTYBLOW 14099
2828

29-
#define ADD_1X -169.839203
30-
#define ADD_1Y -324.961395
31-
#define ADD_1Z 64.401443
32-
#define ADD_1O 3.124724
29+
#define ADD_1X -169.839203f
30+
#define ADD_1Y -324.961395f
31+
#define ADD_1Z 64.401443f
32+
#define ADD_1O 3.124724f
3333

3434
struct MANGOS_DLL_DECL boss_halyconAI : public ScriptedAI
3535
{

‎scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ EndScriptData */
2828
#define SPELL_CLEAVE 20691
2929
#define SPELL_KNOCKAWAY 20686
3030

31-
#define ADD_1X -39.355381
32-
#define ADD_1Y -513.456482
33-
#define ADD_1Z 88.472046
34-
#define ADD_1O 4.679872
35-
36-
#define ADD_2X -49.875881
37-
#define ADD_2Y -511.896942
38-
#define ADD_2Z 88.195160
39-
#define ADD_2O 4.613114
31+
#define ADD_1X -39.355381f
32+
#define ADD_1Y -513.456482f
33+
#define ADD_1Z 88.472046f
34+
#define ADD_1O 4.679872f
35+
36+
#define ADD_2X -49.875881f
37+
#define ADD_2Y -511.896942f
38+
#define ADD_2Z 88.195160f
39+
#define ADD_2O 4.613114f
4040

4141
struct MANGOS_DLL_DECL boss_overlordwyrmthalakAI : public ScriptedAI
4242
{

‎scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,20 @@ EndScriptData */
4040
#define CREATURE_CHROMATIC_DRAKANOID 14302
4141
#define CREATURE_NEFARIAN 11583
4242

43-
#define ADD_X1 -7591.151855
44-
#define ADD_X2 -7514.598633
45-
#define ADD_Y1 -1204.051880
46-
#define ADD_Y2 -1150.448853
47-
#define ADD_Z1 476.800476
48-
#define ADD_Z2 476.796570
43+
#define ADD_X1 -7591.151855f
44+
#define ADD_X2 -7514.598633f
45+
#define ADD_Y1 -1204.051880f
46+
#define ADD_Y2 -1150.448853f
47+
#define ADD_Z1 476.800476f
48+
#define ADD_Z2 476.796570f
4949

50-
#define NEF_X -7445
51-
#define NEF_Y -1332
52-
#define NEF_Z 536
50+
#define NEF_X -7445.0f
51+
#define NEF_Y -1332.0f
52+
#define NEF_Z 536.0f
5353

54-
#define HIDE_X -7592
55-
#define HIDE_Y -1264
56-
#define HIDE_Z 481
54+
#define HIDE_X -7592.0f
55+
#define HIDE_Y -1264.0f
56+
#define HIDE_Z 481.0f
5757

5858
#define SPELL_SHADOWBOLT 21077
5959
#define SPELL_FEAR 26070
@@ -261,7 +261,7 @@ struct MANGOS_DLL_DECL boss_victor_nefariusAI : public ScriptedAI
261261
++SpawnedAdds;
262262

263263
//Spawn creature and force it to start attacking a random target
264-
Spawned = m_creature->SummonCreature(CreatureID,ADD_X1,ADD_Y1,ADD_Z1,5.000,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000);
264+
Spawned = m_creature->SummonCreature(CreatureID,ADD_X1,ADD_Y1,ADD_Z1,5.000f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000);
265265
target = SelectUnit(SELECT_TARGET_RANDOM,0);
266266
if (target && Spawned)
267267
{

‎scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ struct MANGOS_DLL_DECL instance_deadmines : public ScriptedInstance
112112
++m_uiDoor_Step;
113113
break;
114114
case 1:
115-
if (Creature* pi1 = pMrSmite->SummonCreature(NPC_PIRATE, 93.68,-678.63,7.71,2.09, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1800000))
116-
pi1->GetMotionMaster()->MovePoint(0,100.11,-670.65,7.42);
117-
if (Creature* pi2 = pMrSmite->SummonCreature(NPC_PIRATE,102.63,-685.07,7.42,1.28, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1800000))
118-
pi2->GetMotionMaster()->MovePoint(0,100.11,-670.65,7.42);
115+
if (Creature* pi1 = pMrSmite->SummonCreature(NPC_PIRATE, 93.68f, -678.63f, 7.71f, 2.09f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1800000))
116+
pi1->GetMotionMaster()->MovePoint(0, 100.11f, -670.65f, 7.42f);
117+
if (Creature* pi2 = pMrSmite->SummonCreature(NPC_PIRATE, 102.63f, -685.07f, 7.42f, 1.28f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1800000))
118+
pi2->GetMotionMaster()->MovePoint(0, 100.11f, -670.65f, 7.42f);
119119
++m_uiDoor_Step;
120120
m_uiIronDoor_Timer = 10000;
121121
break;

‎scripts/eastern_kingdoms/eversong_woods.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ const int32 uiSayId[4] =
6161

6262
float fChallengerLoc[4][4]=
6363
{
64-
{10110.667, -6628.059, 4.100, 2.708},
65-
{10093.919, -6634.340, 4.098, 1.106},
66-
{10087.565, -6617.282, 4.098, 5.887},
67-
{10104.807, -6611.145, 4.101, 4.265}
64+
{10110.667f, -6628.059f, 4.100f, 2.708f},
65+
{10093.919f, -6634.340f, 4.098f, 1.106f},
66+
{10087.565f, -6617.282f, 4.098f, 5.887f},
67+
{10104.807f, -6611.145f, 4.101f, 4.265f}
6868
};
6969

7070
struct MANGOS_DLL_DECL npc_kelerun_bloodmournAI : public ScriptedAI
@@ -391,9 +391,9 @@ struct MANGOS_DLL_DECL npc_apprentice_mirvedaAI : public ScriptedAI
391391
m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
392392
m_uiPlayerGUID = uiPlayerGUID;
393393

394-
m_creature->SummonCreature(NPC_GHARSUL, 8745, -7134.32, 35.22, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000);
395-
m_creature->SummonCreature(NPC_ANGERSHADE, 8745, -7134.32, 35.22, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000);
396-
m_creature->SummonCreature(NPC_ANGERSHADE, 8745, -7134.32, 35.22, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000);
394+
m_creature->SummonCreature(NPC_GHARSUL, 8745.0f, -7134.32f, 35.22f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 4000);
395+
m_creature->SummonCreature(NPC_ANGERSHADE, 8745.0f, -7134.32f, 35.22f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 4000);
396+
m_creature->SummonCreature(NPC_ANGERSHADE, 8745.0f, -7134.32f, 35.22f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 4000);
397397
}
398398

399399
void UpdateAI (const uint32 uiDiff)

‎scripts/eastern_kingdoms/ghostlands.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,9 @@ struct MANGOS_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI
165165
break;
166166
case 18:
167167
DoScriptText(SAY_PROGRESS3, m_creature, pPlayer);
168-
if (Creature* pSum1 = m_creature->SummonCreature(16342, 7627.083984, -7532.538086, 152.128616, 1.082733, TEMPSUMMON_DEAD_DESPAWN, 0))
168+
if (Creature* pSum1 = m_creature->SummonCreature(16342, 7627.083984f, -7532.538086f, 152.128616f, 1.082733f, TEMPSUMMON_DEAD_DESPAWN, 0))
169169
pSum1->AI()->AttackStart(m_creature);
170-
if (Creature* pSum2 = m_creature->SummonCreature(16343, 7620.432129, -7532.550293, 152.454865, 0.827478, TEMPSUMMON_DEAD_DESPAWN, 0))
170+
if (Creature* pSum2 = m_creature->SummonCreature(16343, 7620.432129f, -7532.550293f, 152.454865f, 0.827478f, TEMPSUMMON_DEAD_DESPAWN, 0))
171171
pSum2->AI()->AttackStart(pPlayer);
172172
break;
173173
case 19:

‎scripts/eastern_kingdoms/hinterlands.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,14 +164,14 @@ struct Location
164164

165165
Location m_afAmbushSpawn[] =
166166
{
167-
{191.296204, -2839.329346, 107.388},
168-
{70.972466, -2848.674805, 109.459}
167+
{191.29620f, -2839.329346f, 107.388f},
168+
{70.972466f, -2848.674805f, 109.459f}
169169
};
170170

171171
Location m_afAmbushMoveTo[] =
172172
{
173-
{166.630386, -2824.780273, 108.153},
174-
{70.886589, -2874.335449, 116.675}
173+
{166.63038f, -2824.780273f, 108.153f},
174+
{70.886589f, -2874.335449f, 116.675f}
175175
};
176176

177177
struct MANGOS_DLL_DECL npc_rinjiAI : public npc_escortAI

‎scripts/eastern_kingdoms/karazhan/boss_moroes.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ EndScriptData */
3838
#define SPELL_GOUGE 29425
3939
#define SPELL_FRENZY 37023
4040

41-
#define POS_Z 81.73
41+
#define POS_Z 81.73f
4242

4343
float Locations[4][3]=
4444
{
45-
{-10991.0, -1884.33, 0.614315},
46-
{-10989.4, -1885.88, 0.904913},
47-
{-10978.1, -1887.07, 2.035550},
48-
{-10975.9, -1885.81, 2.253890},
45+
{-10991.0f, -1884.33f, 0.614315f},
46+
{-10989.4f, -1885.88f, 0.904913f},
47+
{-10978.1f, -1887.07f, 2.035550f},
48+
{-10975.9f, -1885.81f, 2.253890f},
4949
};
5050

5151
const uint32 Adds[6]=

0 commit comments

Comments
 (0)