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/Northrend/Naxxramas/boss_anubrekhan.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
#define MOB_CRYPT_GUARD 16573
const Position GuardSummonPos = {3333.72, -3476.30, 287.1, 6.2801};
const Position GuardSummonPos = {3333.72f, -3476.30f, 287.1f, 6.2801f};
enum Events
{
src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
+12 -12
View File
@@ -37,21 +37,21 @@ enum Events
const Position WaypointPositions[12] =
{
// Thane waypoints
{2542.3, -2984.1, 241.49, 5.362},
{2547.6, -2999.4, 241.34, 5.049},
{2542.9, -3015.0, 241.35, 4.654},
{2542.3f, -2984.1f, 241.49f, 5.362f},
{2547.6f, -2999.4f, 241.34f, 5.049f},
{2542.9f, -3015.0f, 241.35f, 4.654f},
// Lady waypoints
{2498.3, -2961.8, 241.28, 3.267},
{2487.7, -2959.2, 241.28, 2.890},
{2469.4, -2947.6, 241.28, 2.576},
{2498.3f, -2961.8f, 241.28f, 3.267f},
{2487.7f, -2959.2f, 241.28f, 2.890f},
{2469.4f, -2947.6f, 241.28f, 2.576f},
// Baron waypoints
{2553.8, -2968.4, 241.33, 5.757},
{2564.3, -2972.5, 241.33, 5.890},
{2583.9, -2971.67, 241.35, 0.008},
{2553.8f, -2968.4f, 241.33f, 5.757f},
{2564.3f, -2972.5f, 241.33f, 5.890f},
{2583.9f, -2971.67f, 241.35f, 0.008f},
// Sir waypoints
{2534.5, -2921.7, 241.53, 1.363},
{2523.5, -2902.8, 241.28, 2.095},
{2517.8, -2896.6, 241.28, 2.315},
{2534.5f, -2921.7f, 241.53f, 1.363f},
{2523.5f, -2902.8f, 241.28f, 2.095f},
{2517.8f, -2896.6f, 241.28f, 2.315f},
};
const uint32 MOB_HORSEMEN[] = {16064, 16065, 30549, 16063};
src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
+3 -3
View File
@@ -28,9 +28,9 @@
const Position PosSummon[3] =
{
{3267.9, -3172.1, 297.42, 0.94},
{3253.2, -3132.3, 297.42, 0},
{3308.3, -3185.8, 297.42, 1.58},
{3267.9f, -3172.1f, 297.42f, 0.94f},
{3253.2f, -3132.3f, 297.42f, 0},
{3308.3f, -3185.8f, 297.42f, 1.58f},
};
enum Events
src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+14 -14
View File
@@ -113,26 +113,26 @@ enum Pos
const Position PosSummonLive[POS_LIVE] =
{
{2669.7, -3428.76, 268.56, 1.6},
{2692.1, -3428.76, 268.56, 1.6},
{2714.4, -3428.76, 268.56, 1.6},
{2669.7, -3431.67, 268.56, 1.6},
{2692.1, -3431.67, 268.56, 1.6},
{2714.4, -3431.67, 268.56, 1.6},
{2669.7f, -3428.76f, 268.56f, 1.6f},
{2692.1f, -3428.76f, 268.56f, 1.6f},
{2714.4f, -3428.76f, 268.56f, 1.6f},
{2669.7f, -3431.67f, 268.56f, 1.6f},
{2692.1f, -3431.67f, 268.56f, 1.6f},
{2714.4f, -3431.67f, 268.56f, 1.6f},
};
const Position PosSummonDead[POS_DEAD] =
{
{2725.1, -3310.0, 268.85, 3.4},
{2699.3, -3322.8, 268.60, 3.3},
{2733.1, -3348.5, 268.84, 3.1},
{2682.8, -3304.2, 268.85, 3.9},
{2664.8, -3340.7, 268.23, 3.7},
{2725.1f, -3310.0f, 268.85f, 3.4f},
{2699.3f, -3322.8f, 268.60f, 3.3f},
{2733.1f, -3348.5f, 268.84f, 3.1f},
{2682.8f, -3304.2f, 268.85f, 3.9f},
{2664.8f, -3340.7f, 268.23f, 3.7f},
};
const float PosGroundLiveSide[4] = {2691.2, -3387.0, 267.68, 1.52};
const float PosGroundDeadSide[4] = {2693.5, -3334.6, 267.68, 4.67};
const float PosPlatform[4] = {2640.5, -3360.6, 285.26, 0};
const float PosGroundLiveSide[4] = {2691.2f, -3387.0f, 267.68f, 1.52f};
const float PosGroundDeadSide[4] = {2693.5f, -3334.6f, 267.68f, 4.67f};
const float PosPlatform[4] = {2640.5f, -3360.6f, 285.26f, 0.0f};
// Predicate function to check that the r efzr unit is NOT on the same side as the source.
struct NotOnSameSide : public std::unary_function<Unit *, bool> {
src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+89 -89
View File
@@ -133,18 +133,18 @@ enum Creatures
const Position Pos[12] =
{
{3783.272705, -5062.697266, 143.711203, 3.617599}, //LEFT_FAR
{3730.291260, -5027.239258, 143.956909, 4.461900}, //LEFT_MIDDLE
{3757.6, -5172.0, 143.7, 1.97}, //WINDOW_PORTAL05
{3759.355225, -5174.128418, 143.802383, 2.170104}, //RIGHT_FAR
{3700.724365, -5185.123047, 143.928024, 1.309310}, //RIGHT_MIDDLE
{3700.86, -5181.29, 143.928024, 1.42}, //WINDOW_PORTAL04
{3754.431396, -5080.727734, 142.036316, 3.736189}, //LEFT_FAR
{3724.396484, -5061.330566, 142.032700, 4.564785}, //LEFT_MIDDLE
{3732.02, -5028.53, 143.92, 4.49}, //WINDOW_PORTAL02
{3687.571777, -5126.831055, 142.017807, 0.604023}, //RIGHT_FAR
{3707.990733, -5151.450195, 142.032562, 1.376855}, //RIGHT_MIDDLE
{3782.76, -5062.97, 143.79, 3.82}, //WINDOW_PORTAL03
{3783.272705f, -5062.697266f, 143.711203f, 3.617599f}, //LEFT_FAR
{3730.291260f, -5027.239258f, 143.956909f, 4.461900f}, //LEFT_MIDDLE
{3757.6f, -5172.0f, 143.7f, 1.97f}, //WINDOW_PORTAL05
{3759.355225f, -5174.128418f, 143.802383f, 2.170104f}, //RIGHT_FAR
{3700.724365f, -5185.123047f, 143.928024f, 1.309310f}, //RIGHT_MIDDLE
{3700.86f, -5181.29f, 143.928024f, 1.42f}, //WINDOW_PORTAL04
{3754.431396f, -5080.727734f, 142.036316f, 3.736189f}, //LEFT_FAR
{3724.396484f, -5061.330566f, 142.032700f, 4.564785f}, //LEFT_MIDDLE
{3732.02f, -5028.53f, 143.92f, 4.49f}, //WINDOW_PORTAL02
{3687.571777f, -5126.831055f, 142.017807f, 0.604023f}, //RIGHT_FAR
{3707.990733f, -5151.450195f, 142.032562f, 1.376855f}, //RIGHT_MIDDLE
{3782.76f, -5062.97f, 143.79f, 3.82f}, //WINDOW_PORTAL03
};
//creatures in corners
@@ -152,95 +152,95 @@ const Position Pos[12] =
#define MAX_ABOMINATIONS 21
const Position PosAbominations[MAX_ABOMINATIONS] =
{
{3755.52, -5155.22, 143.480, 2.0},
{3744.35, -5164.03, 143.590, 2.00},
{3749.28, -5159.04, 143.190, 2.0},
{3774.47, -5076.28, 143.528, 2.15912},
{3765.94, -5074.15, 143.186, 3.77233},
{3763.15, -5063.36, 143.694, 3.77233},
{3737.81, -5045.69, 143.709, 4.9033},
{3728.13, -5045.01, 143.355, 1.45069},
{3721.56, -5048.35, 143.542, 1.45069},
{3689.55, -5049.66, 143.637, 5.2104},
{3681.71, -5053.03, 143.242, 2.47957},
{3677.64, -5061.44, 143.358, 2.47957},
{3654.2, -5090.87, 143.469, 1.0313},
{3650.39, -5097.45, 143.496, 2.5047},
{3658.7, -5103.59, 143.607, 3.3278},
{3659.02, -5133.97, 143.624, 3.84538},
{3666.33, -5139.34, 143.183, 3.84538},
{3669.74, -5149.63, 143.678, 0.528643},
{3695.53, -5169.53, 143.671, 2.11908},
{3701.98, -5166.51, 143.395, 1.24257},
{3709.62, -5169.15, 143.576, 5.97695},
{3755.52f, -5155.22f, 143.480f, 2.0f},
{3744.35f, -5164.03f, 143.590f, 2.00f},
{3749.28f, -5159.04f, 143.190f, 2.0f},
{3774.47f, -5076.28f, 143.528f, 2.15912f},
{3765.94f, -5074.15f, 143.186f, 3.77233f},
{3763.15f, -5063.36f, 143.694f, 3.77233f},
{3737.81f, -5045.69f, 143.709f, 4.9033f},
{3728.13f, -5045.01f, 143.355f, 1.45069f},
{3721.56f, -5048.35f, 143.542f, 1.45069f},
{3689.55f, -5049.66f, 143.637f, 5.2104f},
{3681.71f, -5053.03f, 143.242f, 2.47957f},
{3677.64f, -5061.44f, 143.358f, 2.47957f},
{3654.2f, -5090.87f, 143.469f, 1.0313f},
{3650.39f, -5097.45f, 143.496f, 2.5047f},
{3658.7f, -5103.59f, 143.607f, 3.3278f},
{3659.02f, -5133.97f, 143.624f, 3.84538f},
{3666.33f, -5139.34f, 143.183f, 3.84538f},
{3669.74f, -5149.63f, 143.678f, 0.528643f},
{3695.53f, -5169.53f, 143.671f, 2.11908f},
{3701.98f, -5166.51f, 143.395f, 1.24257f},
{3709.62f, -5169.15f, 143.576f, 5.97695f},
};
//Soldiers of the Frozen Wastes
#define MAX_WASTES 49
const Position PosWastes[MAX_WASTES] =
{
{3754.41, -5147.24, 143.204, 2.0},
{3754.68, -5156.17, 143.418, 2.0},
{3757.91, -5160.12, 143.503, 2.0},
{3752.67, -5164.6, 143.395, 2.0},
{3745.42, -5164.47, 143.565, 2.74587},
{3741.2, -5155.92, 143.17, 5.29134},
{3746.57, -5148.82, 143.176, 5.07772},
{3778.14, -5070.1, 143.568, 3.16208},
{3775.09, -5078.97, 143.65, 2.81022},
{3773.54, -5083.47, 143.758, 3.21549},
{3765, -5078.29, 143.176, 4.36688},
{3766.94, -5072.63, 143.184, 5.27951},
{3762.68, -5064.94, 143.635, 3.95297},
{3769.9, -5059.94, 143.74, 3.36549},
{3736.33, -5042.18, 143.643, 5.9471},
{3727.51, -5040.58, 143.502, 0.871859},
{3719.89, -5049.64, 143.58, 4.75172},
{3720.69, -5044.43, 143.662, 1.87245},
{3725.69, -5048.99, 143.363, 2.48271},
{3732.33, -5054.01, 143.44, 3.59405},
{3738.09, -5051.06, 143.718, 4.70931},
{3682.76, -5063.5, 143.175, 0.636238},
{3686.7, -5060.58, 143.18, 0.636238},
{3682.45, -5057.21, 143.184, 5.61252},
{3677.57, -5053.34, 143.369, 1.52531},
{3677.3, -5062.26, 143.369, 2.73482},
{3691.21, -5053.02, 143.421, 5.93218},
{3685.22, -5053.34, 143.314, 4.70303},
{3652.11, -5088.47, 143.555, 0.793317},
{3648.23, -5093.21, 143.311, 1.18837},
{3648.14, -5100.11, 143.632, 2.12221},
{3653.88, -5099.7, 143.558, 3.04348},
{3661.23, -5100.33, 143.42, 4.08335},
{3663.49, -5092.77, 143.346, 4.47134},
{3661.85, -5087.99, 143.571, 1.0148},
{3664.56, -5149.01, 143.532, 0.0762528},
{3665.01, -5142.04, 143.201, 1.72009},
{3671.15, -5142.92, 143.174, 4.81535},
{3670.18, -5134.38, 143.177, 5.37534},
{3664.33, -5131.69, 143.262, 5.39576},
{3658.21, -5133.63, 143.662, 1.3863},
{3659.7, -5144.49, 143.363, 2.32328},
{3705.71, -5179.63, 143.746, 1.06743},
{3696.77, -5177.45, 143.759, 5.36748},
{3700.97, -5173.13, 143.52, 3.26575},
{3708.53, -5172.19, 143.573, 3.26575},
{3712.49, -5167.62, 143.657, 5.63295},
{3704.89, -5161.84, 143.239, 5.63295},
{3695.66, -5164.63, 143.674, 1.54416},
{3754.41f, -5147.24f, 143.204f, 2.0f},
{3754.68f, -5156.17f, 143.418f, 2.0f},
{3757.91f, -5160.12f, 143.503f, 2.0f},
{3752.67f, -5164.6f, 143.395f, 2.0f},
{3745.42f, -5164.47f, 143.565f, 2.74587f},
{3741.2f, -5155.92f, 143.17f, 5.29134f},
{3746.57f, -5148.82f, 143.176f, 5.07772f},
{3778.14f, -5070.1f, 143.568f, 3.16208f},
{3775.09f, -5078.97f, 143.65f, 2.81022f},
{3773.54f, -5083.47f, 143.758f, 3.21549f},
{3765, -5078.29f, 143.176f, 4.36688f},
{3766.94f, -5072.63f, 143.184f, 5.27951f},
{3762.68f, -5064.94f, 143.635f, 3.95297f},
{3769.9f, -5059.94f, 143.74f, 3.36549f},
{3736.33f, -5042.18f, 143.643f, 5.9471f},
{3727.51f, -5040.58f, 143.502f, 0.871859f},
{3719.89f, -5049.64f, 143.58f, 4.75172f},
{3720.69f, -5044.43f, 143.662f, 1.87245f},
{3725.69f, -5048.99f, 143.363f, 2.48271f},
{3732.33f, -5054.01f, 143.44f, 3.59405f},
{3738.09f, -5051.06f, 143.718f, 4.70931f},
{3682.76f, -5063.5f, 143.175f, 0.636238f},
{3686.7f, -5060.58f, 143.18f, 0.636238f},
{3682.45f, -5057.21f, 143.184f, 5.61252f},
{3677.57f, -5053.34f, 143.369f, 1.52531f},
{3677.3f, -5062.26f, 143.369f, 2.73482f},
{3691.21f, -5053.02f, 143.421f, 5.93218f},
{3685.22f, -5053.34f, 143.314f, 4.70303f},
{3652.11f, -5088.47f, 143.555f, 0.793317f},
{3648.23f, -5093.21f, 143.311f, 1.18837f},
{3648.14f, -5100.11f, 143.632f, 2.12221f},
{3653.88f, -5099.7f, 143.558f, 3.04348f},
{3661.23f, -5100.33f, 143.42f, 4.08335f},
{3663.49f, -5092.77f, 143.346f, 4.47134f},
{3661.85f, -5087.99f, 143.571f, 1.0148f},
{3664.56f, -5149.01f, 143.532f, 0.0762528f},
{3665.01f, -5142.04f, 143.201f, 1.72009f},
{3671.15f, -5142.92f, 143.174f, 4.81535f},
{3670.18f, -5134.38f, 143.177f, 5.37534f},
{3664.33f, -5131.69f, 143.262f, 5.39576f},
{3658.21f, -5133.63f, 143.662f, 1.3863f},
{3659.7f, -5144.49f, 143.363f, 2.32328f},
{3705.71f, -5179.63f, 143.746f, 1.06743f},
{3696.77f, -5177.45f, 143.759f, 5.36748f},
{3700.97f, -5173.13f, 143.52f, 3.26575f},
{3708.53f, -5172.19f, 143.573f, 3.26575f},
{3712.49f, -5167.62f, 143.657f, 5.63295f},
{3704.89f, -5161.84f, 143.239f, 5.63295f},
{3695.66f, -5164.63f, 143.674f, 1.54416f},
};
//Soul Weavers
#define MAX_WEAVERS 7
const Position PosWeavers[MAX_WEAVERS] =
{
{3752.45, -5168.35, 143.562, 1.6094},
{3772.2, -5070.04, 143.329, 1.93686},
{3732.28, -5032.88, 143.771, 3.08355},
{3689.05, -5055.7, 143.172, 6.09554},
{3649.45, -5093.17, 143.299, 2.51805},
{3659.7, -5144.49, 143.363, 4.08806},
{3704.71, -5175.96, 143.597, 3.36549},
{3752.45f, -5168.35f, 143.562f, 1.6094f},
{3772.2f, -5070.04f, 143.329f, 1.93686f},
{3732.28f, -5032.88f, 143.771f, 3.08355f},
{3689.05f, -5055.7f, 143.172f, 6.09554f},
{3649.45f, -5093.17f, 143.299f, 2.51805f},
{3659.7f, -5144.49f, 143.363f, 4.08806f},
{3704.71f, -5175.96f, 143.597f, 3.36549f},
};
// predicate function to select not charmed target
src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
+3 -3
View File
@@ -40,9 +40,9 @@ enum Creatures
#define MAX_POS_WRAP 3
const Position PosWrap[MAX_POS_WRAP] =
{
{3546.796, -3869.082, 296.450, 0.0},
{3531.271, -3847.424, 299.450, 0.0},
{3497.067, -3843.384, 302.384, 0.0},
{3546.796f, -3869.082f, 296.450f, 0.0f},
{3531.271f, -3847.424f, 299.450f, 0.0f},
{3497.067f, -3843.384f, 302.384f, 0.0f},
};
enum Events
src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
+9 -9
View File
@@ -35,20 +35,20 @@
#define MOB_GUARDIAN 16981
// Teleport position of Noth on his balcony
#define TELE_X 2631.370
#define TELE_Y -3529.680
#define TELE_Z 274.040
#define TELE_O 6.277
#define TELE_X 2631.370f
#define TELE_Y -3529.680f
#define TELE_Z 274.040f
#define TELE_O 6.277f
#define MAX_SUMMON_POS 5
const float SummonPos[MAX_SUMMON_POS][4] =
{
{2728.12, -3544.43, 261.91, 6.04},
{2729.05, -3544.47, 261.91, 5.58},
{2728.24, -3465.08, 264.20, 3.56},
{2704.11, -3456.81, 265.53, 4.51},
{2663.56, -3464.43, 262.66, 5.20},
{2728.12f, -3544.43f, 261.91f, 6.04f},
{2729.05f, -3544.47f, 261.91f, 5.58f},
{2728.24f, -3465.08f, 264.20f, 3.56f},
{2704.11f, -3456.81f, 265.53f, 4.51f},
{2663.56f, -3464.43f, 262.66f, 5.20f},
};
enum Events