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/EasternKingdoms/ZulAman/boss_hexlord.cpp
+5 -5
View File
@@ -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;
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+15 -15
View File
@@ -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
src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
+11 -11
View File
@@ -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;
}
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
+8 -8
View File
@@ -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;
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
+4 -4
View File
@@ -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
};