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/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+67 -67
View File
@@ -25,66 +25,66 @@ int const pyramidSpawnTotal = 54;
/* list of wave spawns: 0 = wave ID, 1 = creature id, 2 = x, 3 = y
no z coordinat b/c they're all the same */
float pyramidSpawns [pyramidSpawnTotal][4] = {
{1,7789,1894.64,1206.29},
{1,7787,1890.08,1218.68},
{1,8876,1883.76,1222.3},
{1,7789,1874.18,1221.24},
{1,7787,1892.28,1225.49},
{1,7788,1889.94,1212.21},
{1,7787,1879.02,1223.06},
{1,7789,1874.45,1204.44},
{1,8876,1898.23,1217.97},
{1,7787,1882.07,1225.7},
{1,8877,1896.46,1205.62},
{1,7787,1886.97,1225.86},
{1,7787,1894.72,1221.91},
{1,7787,1883.5,1218.25},
{1,7787,1886.93,1221.4},
{1,8876,1889.82,1222.51},
{1,7788,1893.07,1215.26},
{1,7788,1878.57,1214.16},
{1,7788,1883.74,1212.35},
{1,8877,1877,1207.27},
{1,8877,1873.63,1204.65},
{1,8876,1877.4,1216.41},
{1,8877,1899.63,1202.52},
{2,7789,1902.83,1223.41},
{2,8876,1889.82,1222.51},
{2,7787,1883.5,1218.25},
{2,7788,1883.74,1212.35},
{2,8877,1877,1207.27},
{2,7787,1890.08,1218.68},
{2,7789,1894.64,1206.29},
{2,8876,1877.4,1216.41},
{2,7787,1892.28,1225.49},
{2,7788,1893.07,1215.26},
{2,8877,1896.46,1205.62},
{2,7789,1874.45,1204.44},
{2,7789,1874.18,1221.24},
{2,7787,1879.02,1223.06},
{2,8876,1898.23,1217.97},
{2,7787,1882.07,1225.7},
{2,8877,1873.63,1204.65},
{2,7787,1886.97,1225.86},
{2,7788,1878.57,1214.16},
{2,7787,1894.72,1221.91},
{2,7787,1886.93,1221.4},
{2,8876,1883.76,1222.3},
{2,7788,1889.94,1212.21},
{2,8877,1899.63,1202.52},
{3,7788,1878.57,1214.16},
{3,7787,1894.72,1221.91},
{3,7787,1886.93,1221.4},
{3,8876,1883.76,1222.3},
{3,7788,1889.94,1212.21},
{3,7275,1889.23,1207.72},
{3,7796,1879.77,1207.96}
{1,7789,1894.64f,1206.29f},
{1,7787,1890.08f,1218.68f},
{1,8876,1883.76f,1222.3f},
{1,7789,1874.18f,1221.24f},
{1,7787,1892.28f,1225.49f},
{1,7788,1889.94f,1212.21f},
{1,7787,1879.02f,1223.06f},
{1,7789,1874.45f,1204.44f},
{1,8876,1898.23f,1217.97f},
{1,7787,1882.07f,1225.7f},
{1,8877,1896.46f,1205.62f},
{1,7787,1886.97f,1225.86f},
{1,7787,1894.72f,1221.91f},
{1,7787,1883.5f,1218.25f},
{1,7787,1886.93f,1221.4f},
{1,8876,1889.82f,1222.51f},
{1,7788,1893.07f,1215.26f},
{1,7788,1878.57f,1214.16f},
{1,7788,1883.74f,1212.35f},
{1,8877,1877,1207.27f},
{1,8877,1873.63f,1204.65f},
{1,8876,1877.4f,1216.41f},
{1,8877,1899.63f,1202.52f},
{2,7789,1902.83f,1223.41f},
{2,8876,1889.82f,1222.51f},
{2,7787,1883.5f,1218.25f},
{2,7788,1883.74f,1212.35f},
{2,8877,1877,1207.27f},
{2,7787,1890.08f,1218.68f},
{2,7789,1894.64f,1206.29f},
{2,8876,1877.4f,1216.41f},
{2,7787,1892.28f,1225.49f},
{2,7788,1893.07f,1215.26f},
{2,8877,1896.46f,1205.62f},
{2,7789,1874.45f,1204.44f},
{2,7789,1874.18f,1221.24f},
{2,7787,1879.02f,1223.06f},
{2,8876,1898.23f,1217.97f},
{2,7787,1882.07f,1225.7f},
{2,8877,1873.63f,1204.65f},
{2,7787,1886.97f,1225.86f},
{2,7788,1878.57f,1214.16f},
{2,7787,1894.72f,1221.91f},
{2,7787,1886.93f,1221.4f},
{2,8876,1883.76f,1222.3f},
{2,7788,1889.94f,1212.21f},
{2,8877,1899.63f,1202.52f},
{3,7788,1878.57f,1214.16f},
{3,7787,1894.72f,1221.91f},
{3,7787,1886.93f,1221.4f},
{3,8876,1883.76f,1222.3f},
{3,7788,1889.94f,1212.21f},
{3,7275,1889.23f,1207.72f},
{3,7796,1879.77f,1207.96f}
};
float Spawnsway[2][3] =
{
{1884.86,1228.62,9},
{1887.53,1263,41}
{1884.86f,1228.62f,9},
{1887.53f,1263,41}
};
class instance_zulfarrak : public InstanceMapScript
@@ -269,11 +269,11 @@ public:
if (major_wave_Timer<diff)
{
// move NPCs to bottom of stair
MoveNPCIfAlive(ENTRY_BLY,1887.92,1228.179,9.98,4.78);
MoveNPCIfAlive(ENTRY_MURTA,1891.57,1228.68,9.69,4.78);
MoveNPCIfAlive(ENTRY_ORO,1897.23,1228.34,9.43,4.78);
MoveNPCIfAlive(ENTRY_RAVEN,1883.68,1227.95,9.543,4.78);
MoveNPCIfAlive(ENTRY_WEEGLI,1878.02,1227.65,9.485,4.78);
MoveNPCIfAlive(ENTRY_BLY,1887.92f,1228.179f,9.98f,4.78f);
MoveNPCIfAlive(ENTRY_MURTA,1891.57f,1228.68f,9.69f,4.78f);
MoveNPCIfAlive(ENTRY_ORO,1897.23f,1228.34f,9.43f,4.78f);
MoveNPCIfAlive(ENTRY_RAVEN,1883.68f,1227.95f,9.543f,4.78f);
MoveNPCIfAlive(ENTRY_WEEGLI,1878.02f,1227.65f,9.485f,4.78f);
SetData(EVENT_PYRAMID,PYRAMID_WAVE_3);
}
else
@@ -283,11 +283,11 @@ public:
if (IsWaveAllDead()) // move NPCS to their final positions
{
SetData(EVENT_PYRAMID,PYRAMID_KILLED_ALL_TROLLS);
MoveNPCIfAlive(ENTRY_BLY,1883.82,1200.83,8.87,1.32);
MoveNPCIfAlive(ENTRY_MURTA,1891.83,1201.45,8.87,1.32);
MoveNPCIfAlive(ENTRY_ORO,1894.50,1204.40,8.87,1.32);
MoveNPCIfAlive(ENTRY_RAVEN,1874.11,1206.17,8.87,1.32);
MoveNPCIfAlive(ENTRY_WEEGLI,1877.52,1199.63,8.87,1.32);
MoveNPCIfAlive(ENTRY_BLY,1883.82f,1200.83f,8.87f,1.32f);
MoveNPCIfAlive(ENTRY_MURTA,1891.83f,1201.45f,8.87f,1.32f);
MoveNPCIfAlive(ENTRY_ORO,1894.50f,1204.40f,8.87f,1.32f);
MoveNPCIfAlive(ENTRY_RAVEN,1874.11f,1206.17f,8.87f,1.32f);
MoveNPCIfAlive(ENTRY_WEEGLI,1877.52f,1199.63f,8.87f,1.32f);
}
break;
};
@@ -313,7 +313,7 @@ public:
{
if (pyramidSpawns[i][0] == (float)wave)
{
Position pos = {pyramidSpawns[i][2], pyramidSpawns[i][3], 8.87, 0};
Position pos = {pyramidSpawns[i][2], pyramidSpawns[i][3], 8.87f, 0};
TempSummon* ts = instance->SummonCreature(pyramidSpawns[i][1],pos);
ts->GetMotionMaster()->MoveRandom(10);
addsAtBase.push_back(ts->GetGUID());
src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
+8 -8
View File
@@ -224,11 +224,11 @@ public:
{
pInstance->SetData(EVENT_PYRAMID, PYRAMID_CAGES_OPEN);
//set bly & co to aggressive & start moving to top of stairs
initBlyCrewMember(pInstance,ENTRY_BLY,1884.99,1263,41.52);
initBlyCrewMember(pInstance,ENTRY_RAVEN,1882.5,1263,41.52);
initBlyCrewMember(pInstance,ENTRY_ORO,1886.47,1270.68,41.68);
initBlyCrewMember(pInstance,ENTRY_WEEGLI,1890,1263,41.52);
initBlyCrewMember(pInstance,ENTRY_MURTA,1891.19,1272.03,41.60);
initBlyCrewMember(pInstance,ENTRY_BLY,1884.99f,1263,41.52f);
initBlyCrewMember(pInstance,ENTRY_RAVEN,1882.5f,1263,41.52f);
initBlyCrewMember(pInstance,ENTRY_ORO,1886.47f,1270.68f,41.68f);
initBlyCrewMember(pInstance,ENTRY_WEEGLI,1890,1263,41.52f);
initBlyCrewMember(pInstance,ENTRY_MURTA,1891.19f,1272.03f,41.60f);
}
return false;
}
@@ -362,7 +362,7 @@ public:
{
pInstance->SetData(EVENT_PYRAMID,PYRAMID_ARRIVED_AT_STAIR);
DoScriptText(SAY_WEEGLI_OHNO,me);
me->SetHomePosition(1882.69,1272.28,41.87,0);
me->SetHomePosition(1882.69f,1272.28f,41.87f,0);
}
else
if (destroyingDoor)
@@ -384,8 +384,8 @@ public:
if (me->isAlive())
{
me->setFaction(FACTION_FRIENDLY);
me->GetMotionMaster()->MovePoint(0, 1858.57,1146.35,14.745);
me->SetHomePosition(1858.57,1146.35,14.745,3.85); // in case he gets interrupted
me->GetMotionMaster()->MovePoint(0, 1858.57f,1146.35f,14.745f);
me->SetHomePosition(1858.57f,1146.35f,14.745f,3.85f); // in case he gets interrupted
DoScriptText(SAY_WEEGLI_OK_I_GO,me);
destroyingDoor=true;
}