diff options
| author | azazel <none@none> | 2010-08-22 23:46:40 +0600 |
|---|---|---|
| committer | azazel <none@none> | 2010-08-22 23:46:40 +0600 |
| commit | 399e35f8f53aeabcda8af513a37bb855340663e5 (patch) | |
| tree | 7beb6bf445bd0fd46e3341039b6d712bb08bbe2e /src/server/scripts/EasternKingdoms/SunwellPlateau | |
| parent | d38135d1fd9417f90ee6f9decc37767f95035596 (diff) | |
Core:
* fix "warning C4305: 'initializing' : truncation from 'double' to 'float'" warnings
* fix some other warnings here and there
--HG--
branch : trunk
Diffstat (limited to 'src/server/scripts/EasternKingdoms/SunwellPlateau')
4 files changed, 29 insertions, 29 deletions
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; |
