Core:

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

--HG--
branch : trunk

6 files changed, 107 insertions, 107 deletions

diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
index 8b9a3b569dc..966338ba9a6 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
@@ -131,18 +131,18 @@ enum EP_Towers
 
 const go_type EPCapturePoints[EP_TOWER_NUM] =
 {
-    {182097,0,2574.51,-4794.89,144.704,-1.45003,-0.097056,0.095578,-0.656229,0.742165},
-    {181899,0,3181.08,-4379.36,174.123,-2.03472,-0.065392,0.119494,-0.842275,0.521553},
-    {182098,0,2962.71,-3042.31,154.789,2.08426,-0.074807,-0.113837,0.855928,0.49883},
-    {182096,0,1860.85,-3731.23,196.716,-2.53214,0.033967,-0.131914,0.944741,-0.298177}
+    {182097,0,2574.51f,-4794.89f,144.704f,-1.45003f,-0.097056f,0.095578f,-0.656229f,0.742165f},
+    {181899,0,3181.08f,-4379.36f,174.123f,-2.03472f,-0.065392f,0.119494f,-0.842275f,0.521553f},
+    {182098,0,2962.71f,-3042.31f,154.789f,2.08426f,-0.074807f,-0.113837f,0.855928f,0.49883f},
+    {182096,0,1860.85f,-3731.23f,196.716f,-2.53214f,0.033967f,-0.131914f,0.944741f,-0.298177f}
 };
 
 const go_type EPTowerFlags[EP_TOWER_NUM] =
 {
-    {182106,0,2569.60,-4772.93,115.399,2.72271,0,0,0.978148,0.207912},
-    {182106,0,3148.17,-4365.51,145.029,1.53589,0,0,0.694658,0.71934},
-    {182106,0,2992.63,-3022.95,125.593,3.03687,0,0,0.99863,0.052336},
-    {182106,0,1838.42,-3703.56,167.713,0.890118,0,0,0.430511,0.902585}
+    {182106,0,2569.60f,-4772.93f,115.399f,2.72271f,0.0f,0.0f,0.978148f,0.207912f},
+    {182106,0,3148.17f,-4365.51f,145.029f,1.53589f,0.0f,0.0f,0.694658f,0.71934f},
+    {182106,0,2992.63f,-3022.95f,125.593f,3.03687f,0.0f,0.0f,0.99863f,0.052336f},
+    {182106,0,1838.42f,-3703.56f,167.713f,0.890118f,0.0f,0.0f,0.430511f,0.902585f}
 };
 
 const uint32 EPTowerPlayerEnterEvents[EP_TOWER_NUM] = {10691,10699,10701,10705};
@@ -156,20 +156,20 @@ const uint32 EP_EWT_NUM_CREATURES = 5;
 // should be spawned at EWT and follow a path, but trans-grid pathing isn't safe, so summon them directly at NPT
 const creature_type EP_EWT_Summons_A[EP_EWT_NUM_CREATURES] =
 {
-    {17635,469,0, 3167.61,-4352.09,138.20,4.5811},
-    {17647,469,0, 3172.74,-4352.99,139.14,4.9873},
-    {17647,469,0, 3165.89,-4354.46,138.67,3.7244},
-    {17647,469,0, 3164.65,-4350.26,138.22,2.4794},
-    {17647,469,0, 3169.91,-4349.68,138.37,0.7444}
+    {17635,469,0, 3167.61f,-4352.09f,138.20f,4.5811f},
+    {17647,469,0, 3172.74f,-4352.99f,139.14f,4.9873f},
+    {17647,469,0, 3165.89f,-4354.46f,138.67f,3.7244f},
+    {17647,469,0, 3164.65f,-4350.26f,138.22f,2.4794f},
+    {17647,469,0, 3169.91f,-4349.68f,138.37f,0.7444f}
 };
 
 const creature_type EP_EWT_Summons_H[EP_EWT_NUM_CREATURES] =
 {
-    {17995,67,0, 3167.61,-4352.09,138.20,4.5811},
-    {17996,67,0, 3172.74,-4352.99,139.14,4.9873},
-    {17996,67,0, 3165.89,-4354.46,138.67,3.7244},
-    {17996,67,0, 3164.65,-4350.26,138.22,2.4794},
-    {17996,67,0, 3169.91,-4349.68,138.37,0.7444}
+    {17995,67,0, 3167.61f,-4352.09f,138.20f,4.5811f},
+    {17996,67,0, 3172.74f,-4352.99f,139.14f,4.9873f},
+    {17996,67,0, 3165.89f,-4354.46f,138.67f,3.7244f},
+    {17996,67,0, 3164.65f,-4350.26f,138.22f,2.4794f},
+    {17996,67,0, 3169.91f,-4349.68f,138.37f,0.7444f}
 };
 
 enum EP_TowerStates
@@ -184,10 +184,10 @@ enum EP_TowerStates
 };
 
 // when spawning, pay attention at setting the faction manually!
-const creature_type EP_PWT_FlightMaster = {17209,0,0,2987.5,-3049.11,120.126,5.75959};
+const creature_type EP_PWT_FlightMaster = {17209,0,0,2987.5f,-3049.11f,120.126f,5.75959f};
 
 // after spawning, modify the faction so that only the controller will be able to use it with SetUInt32Value(GAMEOBJECT_FACTION, faction_id);
-const go_type EP_NPT_LordaeronShrine = {181682,0,3167.72,-4355.91,138.785,1.69297,0,0,0.748956,0.66262};
+const go_type EP_NPT_LordaeronShrine = {181682,0,3167.72f,-4355.91f,138.785f,1.69297f,0.0f,0.0f,0.748956f,0.66262f};
 
 class OutdoorPvPEP;
 
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h
index 0e18a35ccc7..304cd78052b 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h
@@ -74,16 +74,16 @@ const uint32 HP_TowerArtKit_N[HP_TOWER_NUM] = {66,63,69};
 
 const go_type HPCapturePoints[HP_TOWER_NUM] =
 {
-    {182175,530,-471.462,3451.09,34.6432,0.174533,0,0,0.087156,0.996195},      // 0 - Broken Hill
-    {182174,530,-184.889,3476.93,38.205,-0.017453,0,0,0.008727,-0.999962},     // 1 - Overlook
-    {182173,530,-290.016,3702.42,56.6729,0.034907,0,0,0.017452,0.999848}     // 2 - Stadium
+    {182175,530,-471.462f,3451.09f,34.6432f,0.174533f,0.0f,0.0f,0.087156f,0.996195f},      // 0 - Broken Hill
+    {182174,530,-184.889f,3476.93f,38.205f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f},     // 1 - Overlook
+    {182173,530,-290.016f,3702.42f,56.6729f,0.034907f,0.0f,0.0f,0.017452f,0.999848f}     // 2 - Stadium
 };
 
 const go_type HPTowerFlags[HP_TOWER_NUM] =
 {
-    {183514,530,-467.078,3528.17,64.7121,3.14159,0,0,1,0},  // 0 broken hill
-    {182525,530,-187.887,3459.38,60.0403,-3.12414,0,0,0.999962,-0.008727}, // 1 overlook
-    {183515,530,-289.610,3696.83,75.9447,3.12414,0,0,0.999962,0.008727} // 2 stadium
+    {183514,530,-467.078f,3528.17f,64.7121f,3.14159f,0.0f,0.0f,1.0f,0.0f},  // 0 broken hill
+    {182525,530,-187.887f,3459.38f,60.0403f,-3.12414f,0.0f,0.0f,0.999962f,-0.008727f}, // 1 overlook
+    {183515,530,-289.610f,3696.83f,75.9447f,3.12414f,0.0f,0.0f,0.999962f,0.008727f} // 2 stadium
 };
 
 class OPvPCapturePointHP : public OPvPCapturePoint
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
index 7f49dffe4fd..e0f3584f22f 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
@@ -208,7 +208,7 @@ OPvPCapturePoint(pvp), m_capturable(true), m_GuardsAlive(0), m_ControllingFactio
 m_WyvernStateNorth(0), m_WyvernStateSouth(0), m_WyvernStateEast(0), m_WyvernStateWest(0),
 m_HalaaState(HALAA_N), m_RespawnTimer(NA_RESPAWN_TIME), m_GuardCheckTimer(NA_GUARD_CHECK_TIME)
 {
-    SetCapturePointData(182210,530,-1572.57,7945.3,-22.475,2.05949,0,0,0.857167,0.515038);
+    SetCapturePointData(182210,530,-1572.57f,7945.3f,-22.475f,2.05949f,0.0f,0.0f,0.857167f,0.515038f);
 }
 
 bool OutdoorPvPNA::SetupOutdoorPvP()
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
index 9bfadeef4e0..bc28581dbe1 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
@@ -120,39 +120,39 @@ enum FlightSpellsNA
 // spawned when the alliance is attacking, horde is in control
 const go_type HordeControlGOs[NA_CONTROL_GO_NUM] =
 {
-    {182267,530,-1815.8,8036.51,-26.2354,-2.89725,0,0,0.992546,-0.121869}, //ALLY_ROOST_SOUTH
-    {182280,530,-1507.95,8132.1,-19.5585,-1.3439,0,0,0.622515,-0.782608}, //ALLY_ROOST_WEST
-    {182281,530,-1384.52,7779.33,-11.1663,-0.575959,0,0,0.284015,-0.95882}, //ALLY_ROOST_NORTH
-    {182282,530,-1650.11,7732.56,-15.4505,-2.80998,0,0,0.986286,-0.165048}, //ALLY_ROOST_EAST
-
-    {182222,530,-1825.4022,8039.2602,-26.08,-2.89725,0,0,0.992546,-0.121869}, //HORDE_BOMB_WAGON_SOUTH
-    {182272,530,-1515.37,8136.91,-20.42,-1.3439,0,0,0.622515,-0.782608}, //HORDE_BOMB_WAGON_WEST
-    {182273,530,-1377.95,7773.44,-10.31,-0.575959,0,0,0.284015,-0.95882}, //HORDE_BOMB_WAGON_NORTH
-    {182274,530,-1659.87,7733.15,-15.75,-2.80998,0,0,0.986286,-0.165048}, //HORDE_BOMB_WAGON_EAST
-
-    {182266,530,-1815.8,8036.51,-26.2354,-2.89725,0,0,0.992546,-0.121869}, //DESTROYED_ALLY_ROOST_SOUTH
-    {182275,530,-1507.95,8132.1,-19.5585,-1.3439,0,0,0.622515,-0.782608}, //DESTROYED_ALLY_ROOST_WEST
-    {182276,530,-1384.52,7779.33,-11.1663,-0.575959,0,0,0.284015,-0.95882}, //DESTROYED_ALLY_ROOST_NORTH
-    {182277,530,-1650.11,7732.56,-15.4505,-2.80998,0,0,0.986286,-0.165048}  //DESTROYED_ALLY_ROOST_EAST
+    {182267,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //ALLY_ROOST_SOUTH
+    {182280,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //ALLY_ROOST_WEST
+    {182281,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //ALLY_ROOST_NORTH
+    {182282,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //ALLY_ROOST_EAST
+
+    {182222,530,-1825.4022f,8039.2602f,-26.08f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //HORDE_BOMB_WAGON_SOUTH
+    {182272,530,-1515.37f,8136.91f,-20.42f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //HORDE_BOMB_WAGON_WEST
+    {182273,530,-1377.95f,7773.44f,-10.31f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //HORDE_BOMB_WAGON_NORTH
+    {182274,530,-1659.87f,7733.15f,-15.75f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //HORDE_BOMB_WAGON_EAST
+
+    {182266,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //DESTROYED_ALLY_ROOST_SOUTH
+    {182275,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //DESTROYED_ALLY_ROOST_WEST
+    {182276,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //DESTROYED_ALLY_ROOST_NORTH
+    {182277,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}  //DESTROYED_ALLY_ROOST_EAST
 };
 
 // spawned when the horde is attacking, alliance is in control
 const go_type AllianceControlGOs[NA_CONTROL_GO_NUM] =
 {
-    {182301,530,-1815.8,8036.51,-26.2354,-2.89725,0,0,0.992546,-0.121869}, //HORDE_ROOST_SOUTH
-    {182302,530,-1507.95,8132.1,-19.5585,-1.3439,0,0,0.622515,-0.782608}, //HORDE_ROOST_WEST
-    {182303,530,-1384.52,7779.33,-11.1663,-0.575959,0,0,0.284015,-0.95882}, //HORDE_ROOST_NORTH
-    {182304,530,-1650.11,7732.56,-15.4505,-2.80998,0,0,0.986286,-0.165048}, //HORDE_ROOST_EAST
-
-    {182305,530,-1825.4022,8039.2602,-26.08,-2.89725,0,0,0.992546,-0.121869}, //ALLY_BOMB_WAGON_SOUTH
-    {182306,530,-1515.37,8136.91,-20.42,-1.3439,0,0,0.622515,-0.782608}, //ALLY_BOMB_WAGON_WEST
-    {182307,530,-1377.95,7773.44,-10.31,-0.575959,0,0,0.284015,-0.95882}, //ALLY_BOMB_WAGON_NORTH
-    {182308,530,-1659.87,7733.15,-15.75,-2.80998,0,0,0.986286,-0.165048}, //ALLY_BOMB_WAGON_EAST
-
-    {182297,530,-1815.8,8036.51,-26.2354,-2.89725,0,0,0.992546,-0.121869}, //DESTROYED_HORDE_ROOST_SOUTH
-    {182298,530,-1507.95,8132.1,-19.5585,-1.3439,0,0,0.622515,-0.782608}, //DESTROYED_HORDE_ROOST_WEST
-    {182299,530,-1384.52,7779.33,-11.1663,-0.575959,0,0,0.284015,-0.95882}, //DESTROYED_HORDE_ROOST_NORTH
-    {182300,530,-1650.11,7732.56,-15.4505,-2.80998,0,0,0.986286,-0.165048}  //DESTROYED_HORDE_ROOST_EAST
+    {182301,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //HORDE_ROOST_SOUTH
+    {182302,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //HORDE_ROOST_WEST
+    {182303,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //HORDE_ROOST_NORTH
+    {182304,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //HORDE_ROOST_EAST
+
+    {182305,530,-1825.4022f,8039.2602f,-26.08f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //ALLY_BOMB_WAGON_SOUTH
+    {182306,530,-1515.37f,8136.91f,-20.42f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //ALLY_BOMB_WAGON_WEST
+    {182307,530,-1377.95f,7773.44f,-10.31f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //ALLY_BOMB_WAGON_NORTH
+    {182308,530,-1659.87f,7733.15f,-15.75f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //ALLY_BOMB_WAGON_EAST
+
+    {182297,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //DESTROYED_HORDE_ROOST_SOUTH
+    {182298,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //DESTROYED_HORDE_ROOST_WEST
+    {182299,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //DESTROYED_HORDE_ROOST_NORTH
+    {182300,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}  //DESTROYED_HORDE_ROOST_EAST
 };
 
 enum ControlNPCTypes
@@ -184,50 +184,50 @@ enum ControlNPCTypes
 
 const creature_type HordeControlNPCs[NA_CONTROL_NPC_NUM] =
 {
-    {18816,67,530,-1523.92,7951.76,-17.6942,3.51172},
-    {18821,67,530,-1527.75,7952.46,-17.6948,3.99317},
-    {21474,67,530,-1520.14,7927.11,-20.2527,3.39389},
-    {21484,67,530,-1524.84,7930.34,-20.182,3.6405},
-    {21483,67,530,-1570.01,7993.8,-22.4505,5.02655},
-    {18192,67,530,-1654.06,8000.46,-26.59,3.37},
-    {18192,67,530,-1487.18,7899.1,-19.53,0.954},
-    {18192,67,530,-1480.88,7908.79,-19.19,4.485},
-    {18192,67,530,-1540.56,7995.44,-20.45,0.947},
-    {18192,67,530,-1546.95,8000.85,-20.72,6.035},
-    {18192,67,530,-1595.31,7860.53,-21.51,3.747},
-    {18192,67,530,-1642.31,7995.59,-25.8,3.317},
-    {18192,67,530,-1545.46,7995.35,-20.63,1.094},
-    {18192,67,530,-1487.58,7907.99,-19.27,5.567},
-    {18192,67,530,-1651.54,7988.56,-26.5289,2.98451},
-    {18192,67,530,-1602.46,7866.43,-22.1177,4.74729},
-    {18192,67,530,-1591.22,7875.29,-22.3536,4.34587},
-    {18192,67,530,-1550.6,7944.45,-21.63,3.559},
-    {18192,67,530,-1545.57,7935.83,-21.13,3.448},
-    {18192,67,530,-1550.86,7937.56,-21.7,3.801}
+    {18816,67,530,-1523.92f,7951.76f,-17.6942f,3.51172f},
+    {18821,67,530,-1527.75f,7952.46f,-17.6948f,3.99317f},
+    {21474,67,530,-1520.14f,7927.11f,-20.2527f,3.39389f},
+    {21484,67,530,-1524.84f,7930.34f,-20.182f,3.6405f},
+    {21483,67,530,-1570.01f,7993.8f,-22.4505f,5.02655f},
+    {18192,67,530,-1654.06f,8000.46f,-26.59f,3.37f},
+    {18192,67,530,-1487.18f,7899.1f,-19.53f,0.954f},
+    {18192,67,530,-1480.88f,7908.79f,-19.19f,4.485f},
+    {18192,67,530,-1540.56f,7995.44f,-20.45f,0.947f},
+    {18192,67,530,-1546.95f,8000.85f,-20.72f,6.035f},
+    {18192,67,530,-1595.31f,7860.53f,-21.51f,3.747f},
+    {18192,67,530,-1642.31f,7995.59f,-25.8f,3.317f},
+    {18192,67,530,-1545.46f,7995.35f,-20.63f,1.094f},
+    {18192,67,530,-1487.58f,7907.99f,-19.27f,5.567f},
+    {18192,67,530,-1651.54f,7988.56f,-26.5289f,2.98451f},
+    {18192,67,530,-1602.46f,7866.43f,-22.1177f,4.74729f},
+    {18192,67,530,-1591.22f,7875.29f,-22.3536f,4.34587f},
+    {18192,67,530,-1550.6f,7944.45f,-21.63f,3.559f},
+    {18192,67,530,-1545.57f,7935.83f,-21.13f,3.448f},
+    {18192,67,530,-1550.86f,7937.56f,-21.7f,3.801f}
 };
 
 const creature_type AllianceControlNPCs[NA_CONTROL_NPC_NUM] =
 {
-    {18817,469,530,-1591.18,8020.39,-22.2042,4.59022},
-    {18822,469,530,-1588.0,8019.0,-22.2042,4.06662},
-    {21485,469,530,-1521.93,7927.37,-20.2299,3.24631},
-    {21487,469,530,-1540.33,7971.95,-20.7186,3.07178},
-    {21488,469,530,-1570.01,7993.8,-22.4505,5.02655},
-    {18256,469,530,-1654.06,8000.46,-26.59,3.37},
-    {18256,469,530,-1487.18,7899.1,-19.53,0.954},
-    {18256,469,530,-1480.88,7908.79,-19.19,4.485},
-    {18256,469,530,-1540.56,7995.44,-20.45,0.947},
-    {18256,469,530,-1546.95,8000.85,-20.72,6.035},
-    {18256,469,530,-1595.31,7860.53,-21.51,3.747},
-    {18256,469,530,-1642.31,7995.59,-25.8,3.317},
-    {18256,469,530,-1545.46,7995.35,-20.63,1.094},
-    {18256,469,530,-1487.58,7907.99,-19.27,5.567},
-    {18256,469,530,-1651.54,7988.56,-26.5289,2.98451},
-    {18256,469,530,-1602.46,7866.43,-22.1177,4.74729},
-    {18256,469,530,-1591.22,7875.29,-22.3536,4.34587},
-    {18256,469,530,-1603.75,8000.36,-24.18,4.516},
-    {18256,469,530,-1585.73,7994.68,-23.29,4.439},
-    {18256,469,530,-1595.5,7991.27,-23.53,4.738}
+    {18817,469,530,-1591.18f,8020.39f,-22.2042f,4.59022f},
+    {18822,469,530,-1588.0f,8019.0f,-22.2042f,4.06662f},
+    {21485,469,530,-1521.93f,7927.37f,-20.2299f,3.24631f},
+    {21487,469,530,-1540.33f,7971.95f,-20.7186f,3.07178f},
+    {21488,469,530,-1570.01f,7993.8f,-22.4505f,5.02655f},
+    {18256,469,530,-1654.06f,8000.46f,-26.59f,3.37f},
+    {18256,469,530,-1487.18f,7899.1f,-19.53f,0.954f},
+    {18256,469,530,-1480.88f,7908.79f,-19.19f,4.485f},
+    {18256,469,530,-1540.56f,7995.44f,-20.45f,0.947f},
+    {18256,469,530,-1546.95f,8000.85f,-20.72f,6.035f},
+    {18256,469,530,-1595.31f,7860.53f,-21.51f,3.747f},
+    {18256,469,530,-1642.31f,7995.59f,-25.8f,3.317f},
+    {18256,469,530,-1545.46f,7995.35f,-20.63f,1.094f},
+    {18256,469,530,-1487.58f,7907.99f,-19.27f,5.567f},
+    {18256,469,530,-1651.54f,7988.56f,-26.5289f,2.98451f},
+    {18256,469,530,-1602.46f,7866.43f,-22.1177f,4.74729f},
+    {18256,469,530,-1591.22f,7875.29f,-22.3536f,4.34587f},
+    {18256,469,530,-1603.75f,8000.36f,-24.18f,4.516f},
+    {18256,469,530,-1585.73f,7994.68f,-23.29f,4.439f},
+    {18256,469,530,-1595.5f,7991.27f,-23.53f,4.738f}
 };
 
 enum WyvernStates
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h
index ffb36e6f827..ffeb3ffb6ce 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h
@@ -56,11 +56,11 @@ enum OutdoorPvPTF_TowerType
 
 const go_type TFCapturePoints[TF_TOWER_NUM] =
 {
-    {183104,530,-3081.65,5335.03,17.1853,-2.14675,0,0,0.878817,-0.477159},
-    {183411,530,-2939.9,4788.73,18.987,2.77507,0,0,0.983255,0.182236},
-    {183412,530,-3174.94,4440.97,16.2281,1.86750,0,0.803857,0.594823},
-    {183413,530,-3603.31,4529.15,20.9077,0.994838,0,0,0.477159,0.878817},
-    {183414,530,-3812.37,4899.3,17.7249,0.087266,0,0,0.043619,0.999048}
+    {183104,530,-3081.65f,5335.03f,17.1853f,-2.14675f,0.0f,0.0f,0.878817f,-0.477159f},
+    {183411,530,-2939.9f,4788.73f,18.987f,2.77507f,0.0f,0.0f,0.983255f,0.182236f},
+    {183412,530,-3174.94f,4440.97f,16.2281f,1.86750f,0.0f,0.0f,0.803857f,0.594823f},
+    {183413,530,-3603.31f,4529.15f,20.9077f,0.994838f,0.0f,0.0f,0.477159f,0.878817f},
+    {183414,530,-3812.37f,4899.3f,17.7249f,0.087266f,0.0f,0.0f,0.043619f,0.999048f}
 };
 
 struct tf_tower_world_state
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
index 43fa96a5ac2..447823a0ee3 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
@@ -48,15 +48,15 @@ enum OutdoorPvPZMSpells
 };
 
 // banners 182527, 182528, 182529, gotta check them ingame
-const go_type ZM_Banner_A = { 182527,530,253.54,7083.81,36.7728,-0.017453,0,0,0.008727,-0.999962 };
-const go_type ZM_Banner_H = { 182528,530,253.54,7083.81,36.7728,-0.017453,0,0,0.008727,-0.999962 };
-const go_type ZM_Banner_N = { 182529,530,253.54,7083.81,36.7728,-0.017453,0,0,0.008727,-0.999962 };
+const go_type ZM_Banner_A = { 182527,530,253.54f,7083.81f,36.7728f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f };
+const go_type ZM_Banner_H = { 182528,530,253.54f,7083.81f,36.7728f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f };
+const go_type ZM_Banner_N = { 182529,530,253.54f,7083.81f,36.7728f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f };
 
 // horde field scout spawn data
-const creature_type ZM_HordeFieldScout = {18564,67,530,296.625,7818.4,42.6294,5.18363};
+const creature_type ZM_HordeFieldScout = {18564,67,530,296.625f,7818.4f,42.6294f,5.18363f};
 
 // alliance field scout spawn data
-const creature_type ZM_AllianceFieldScout = {18581,469,530,374.395,6230.08,22.8351,0.593412};
+const creature_type ZM_AllianceFieldScout = {18581,469,530,374.395f,6230.08f,22.8351f,0.593412f};
 
 enum ZMCreatureTypes
 {
@@ -119,8 +119,8 @@ const uint32 ZMBeaconLooseH[ZM_NUM_BEACONS] =
 
 const go_type ZMCapturePoints[ZM_NUM_BEACONS] =
 {
-    {182523,530,303.243,6841.36,40.1245,-1.58825,0,0,0.71325,-0.700909},
-    {182522,530,336.466,7340.26,41.4984,-1.58825,0,0,0.71325,-0.700909}
+    {182523,530,303.243f,6841.36f,40.1245f,-1.58825f,0.0f,0.0f,0.71325f,-0.700909f},
+    {182522,530,336.466f,7340.26f,41.4984f,-1.58825f,0.0f,0.0f,0.71325f,-0.700909f}
 };
 
 enum OutdoorPvPZMWorldStates