josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core:

Browse Source 
* fix "warning C4305: 'initializing' : truncation from 'double' to 'float'" warnings
* fix some other warnings here and there

--HG--
branch : trunk
This commit is contained in:
azazel
2010-08-22 23:46:40 +06:00
parent d38135d1fd
commit 399e35f8f5
189 changed files with 2842 additions and 2817 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+12 -12
View File
@@ -64,17 +64,17 @@ EndScriptData */
#define ENTRY_TAINTED_SPAWN 22036
#define ENTRY_BEAM_DUMMY 21934
#define HYDROSS_X -239.439
#define HYDROSS_Y -363.481
#define HYDROSS_X -239.439f
#define HYDROSS_Y -363.481f
#define SPAWN_X_DIFF1 6.934003
#define SPAWN_Y_DIFF1 -11.255012
#define SPAWN_X_DIFF2 -6.934003
#define SPAWN_Y_DIFF2 11.255012
#define SPAWN_X_DIFF3 -12.577011
#define SPAWN_Y_DIFF3 -4.72702
#define SPAWN_X_DIFF4 12.577011
#define SPAWN_Y_DIFF4 4.72702
#define SPAWN_X_DIFF1 6.934003f
#define SPAWN_Y_DIFF1 -11.255012f
#define SPAWN_X_DIFF2 -6.934003f
#define SPAWN_Y_DIFF2 11.255012f
#define SPAWN_X_DIFF3 -12.577011f
#define SPAWN_Y_DIFF3 -4.72702f
#define SPAWN_X_DIFF4 12.577011f
#define SPAWN_Y_DIFF4 4.72702f
class boss_hydross_the_unstable : public CreatureScript
{
@@ -137,7 +137,7 @@ public:
void SummonBeams()
{
Creature* beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-258.333,-356.34,22.0499,5.90835,TEMPSUMMON_CORPSE_DESPAWN,0);
Creature* beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-258.333f,-356.34f,22.0499f,5.90835f,TEMPSUMMON_CORPSE_DESPAWN,0);
if (beamer)
{
beamer->CastSpell(me,SPELL_BLUE_BEAM,true);
@@ -145,7 +145,7 @@ public:
beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
beams[0]=beamer->GetGUID();
}
beamer = beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-219.918,-371.308,22.0042,2.73072,TEMPSUMMON_CORPSE_DESPAWN,0);
beamer = beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-219.918f,-371.308f,22.0042f,2.73072f,TEMPSUMMON_CORPSE_DESPAWN,0);
if (beamer)
{
beamer->CastSpell(me,SPELL_BLUE_BEAM,true);
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+44 -44
View File
@@ -54,14 +54,14 @@ EndScriptData */
#define SPELL_TOXIC_SPORES 38575
#define SPELL_MAGIC_BARRIER 38112
#define MIDDLE_X 30.134
#define MIDDLE_Y -923.65
#define MIDDLE_Z 42.9
#define MIDDLE_X 30.134f
#define MIDDLE_Y -923.65f
#define MIDDLE_Z 42.9f
#define SPOREBAT_X 30.977156
#define SPOREBAT_Y -925.297761
#define SPOREBAT_Z 77.176567
#define SPOREBAT_O 5.223932
#define SPOREBAT_X 30.977156f
#define SPOREBAT_Y -925.297761f
#define SPOREBAT_Z 77.176567f
#define SPOREBAT_O 5.223932f
#define SHIED_GENERATOR_CHANNEL 19870
#define ENCHANTED_ELEMENTAL 21958
@@ -76,60 +76,60 @@ EndScriptData */
float ElementPos[8][4] =
{
{8.3, -835.3, 21.9, 5},
{53.4, -835.3, 21.9, 4.5},
{96, -861.9, 21.8, 4},
{96, -986.4, 21.4, 2.5},
{54.4, -1010.6, 22, 1.8},
{9.8, -1012, 21.7, 1.4},
{-35, -987.6, 21.5, 0.8},
{-58.9, -901.6, 21.5, 6}
{8.3f, -835.3f, 21.9f, 5.0f},
{53.4f, -835.3f, 21.9f, 4.5f},
{96.0f, -861.9f, 21.8f, 4.0f},
{96.0f, -986.4f, 21.4f, 2.5f},
{54.4f, -1010.6f, 22, 1.8f},
{9.8f, -1012, 21.7f, 1.4f},
{-35.0f, -987.6f, 21.5f, 0.8f},
{-58.9f, -901.6f, 21.5f, 6.0f}
};
float ElementWPPos[8][3] =
{
{71.700752, -883.905884, 41.097168},
{45.039848, -868.022827, 41.097015},
{14.585141, -867.894470, 41.097061},
{-25.415508, -906.737732, 41.097061},
{-11.801594, -963.405884, 41.097067},
{14.556657, -979.051514, 41.097137},
{43.466549, -979.406677, 41.097027},
{69.945908, -964.663940, 41.097054}
{71.700752f, -883.905884f, 41.097168f},
{45.039848f, -868.022827f, 41.097015f},
{14.585141f, -867.894470f, 41.097061f},
{-25.415508f, -906.737732f, 41.097061f},
{-11.801594f, -963.405884f, 41.097067f},
{14.556657f, -979.051514f, 41.097137f},
{43.466549f, -979.406677f, 41.097027f},
{69.945908f, -964.663940f, 41.097054f}
};
float SporebatWPPos[8][3] =
{
{31.6,-896.3,59.1},
{9.1, -913.9, 56},
{5.2, -934.4, 52.4},
{20.7, -946.9, 49.7},
{41, -941.9, 51},
{47.7, -927.3, 55},
{42.2, -912.4, 51.7},
{27, -905.9, 50}
{31.6f, -896.3f, 59.1f},
{9.1f, -913.9f, 56.0f},
{5.2f, -934.4f, 52.4f},
{20.7f, -946.9f, 49.7f},
{41.0f, -941.9f, 51.0f},
{47.7f, -927.3f, 55.0f},
{42.2f, -912.4f, 51.7f},
{27.0f, -905.9f, 50.0f}
};
float CoilfangElitePos[3][4] =
{
{28.84, -923.28, 42.9, 6},
{31.183281, -953.502625, 41.523602, 1.640957},
{58.895180, -923.124268, 41.545307, 3.152848}
{28.84f, -923.28f, 42.9f, 6.0f},
{31.183281f, -953.502625f, 41.523602f, 1.640957f},
{58.895180f, -923.124268f, 41.545307f, 3.152848f}
};
float CoilfangStriderPos[3][4] =
{
{66.427010, -948.778503, 41.262245, 2.584220},
{7.513962, -959.538208, 41.300422, 1.034629},
{-12.843201, -907.798401, 41.239620, 6.087094}
{66.427010f, -948.778503f, 41.262245f, 2.584220f},
{7.513962f, -959.538208f, 41.300422f, 1.034629f},
{-12.843201f, -907.798401f, 41.239620f, 6.087094f}
};
float ShieldGeneratorChannelPos[4][4] =
{
{49.6262, -902.181, 43.0975, 3.95683},
{10.988, -901.616, 42.5371, 5.4373},
{10.3859, -944.036, 42.5446, 0.779888},
{49.3126, -943.398, 42.5501, 2.40174}
{49.6262f, -902.181f, 43.0975f, 3.95683f},
{10.988f, -901.616f, 42.5371f, 5.4373f},
{10.3859f, -944.036f, 42.5446f, 0.779888f},
{49.3126f, -943.398f, 42.5501f, 2.40174f}
};
//Lady Vashj AI
@@ -603,8 +603,8 @@ public:
void Reset()
{
me->SetSpeed(MOVE_WALK,0.6);//walk
me->SetSpeed(MOVE_RUN,0.6);//run
me->SetSpeed(MOVE_WALK,0.6f);//walk
me->SetSpeed(MOVE_RUN,0.6f);//run
move = 0;
phase = 1;
@@ -649,7 +649,7 @@ public:
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
if (phase == 1)
me->GetMotionMaster()->MovePoint(0, x, y, z);
if (phase == 1 && me->IsWithinDist3d(x,y,z, 0.1))
if (phase == 1 && me->IsWithinDist3d(x,y,z, 0.1f))
phase = 2;
if (phase == 2)
{
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+9 -9
View File
@@ -55,15 +55,15 @@ EndScriptData */
float AddPos[9][3] =
{
{2.8553810, -459.823914, -19.182686}, //MOVE_AMBUSHER_1 X, Y, Z
{12.400000, -466.042267, -19.182686}, //MOVE_AMBUSHER_2 X, Y, Z
{51.366653, -460.836060, -19.182686}, //MOVE_AMBUSHER_3 X, Y, Z
{62.597980, -457.433044, -19.182686}, //MOVE_AMBUSHER_4 X, Y, Z
{77.607452, -384.302765, -19.182686}, //MOVE_AMBUSHER_5 X, Y, Z
{63.897900, -378.984924, -19.182686}, //MOVE_AMBUSHER_6 X, Y, Z
{34.447250, -387.333618, -19.182686}, //MOVE_GUARDIAN_1 X, Y, Z
{14.388216, -423.468018, -19.625271}, //MOVE_GUARDIAN_2 X, Y, Z
{42.471519, -445.115295, -19.769423} //MOVE_GUARDIAN_3 X, Y, Z
{2.8553810f, -459.823914f, -19.182686f}, //MOVE_AMBUSHER_1 X, Y, Z
{12.400000f, -466.042267f, -19.182686f}, //MOVE_AMBUSHER_2 X, Y, Z
{51.366653f, -460.836060f, -19.182686f}, //MOVE_AMBUSHER_3 X, Y, Z
{62.597980f, -457.433044f, -19.182686f}, //MOVE_AMBUSHER_4 X, Y, Z
{77.607452f, -384.302765f, -19.182686f}, //MOVE_AMBUSHER_5 X, Y, Z
{63.897900f, -378.984924f, -19.182686f}, //MOVE_AMBUSHER_6 X, Y, Z
{34.447250f, -387.333618f, -19.182686f}, //MOVE_GUARDIAN_1 X, Y, Z
{14.388216f, -423.468018f, -19.625271f}, //MOVE_GUARDIAN_2 X, Y, Z
{42.471519f, -445.115295f, -19.769423f} //MOVE_GUARDIAN_3 X, Y, Z
};
class boss_the_lurker_below : public CreatureScript