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/ScarletEnclave/chapter1.cpp
+23 -23
View File
@@ -957,34 +957,34 @@ public:
void InitWaypoint()
{
AddWaypoint(1, 2389.03, -5902.74, 109.014, 5000);
AddWaypoint(2, 2341.812012, -5900.484863, 102.619743);
AddWaypoint(3, 2306.561279, -5901.738281, 91.792419);
AddWaypoint(4, 2300.098389, -5912.618652, 86.014885);
AddWaypoint(5, 2294.142090, -5927.274414, 75.316849);
AddWaypoint(6, 2286.984375, -5944.955566, 63.714966);
AddWaypoint(7, 2280.001709, -5961.186035, 54.228283);
AddWaypoint(8, 2259.389648, -5974.197754, 42.359348);
AddWaypoint(9, 2242.882812, -5984.642578, 32.827850);
AddWaypoint(10, 2217.265625, -6028.959473, 7.675705);
AddWaypoint(11, 2202.595947, -6061.325684, 5.882018);
AddWaypoint(12, 2188.974609, -6080.866699, 3.370027);
AddWaypoint(1, 2389.03f, -5902.74f, 109.014f, 5000);
AddWaypoint(2, 2341.812012f, -5900.484863f, 102.619743f);
AddWaypoint(3, 2306.561279f, -5901.738281f, 91.792419f);
AddWaypoint(4, 2300.098389f, -5912.618652f, 86.014885f);
AddWaypoint(5, 2294.142090f, -5927.274414f, 75.316849f);
AddWaypoint(6, 2286.984375f, -5944.955566f, 63.714966f);
AddWaypoint(7, 2280.001709f, -5961.186035f, 54.228283f);
AddWaypoint(8, 2259.389648f, -5974.197754f, 42.359348f);
AddWaypoint(9, 2242.882812f, -5984.642578f, 32.827850f);
AddWaypoint(10, 2217.265625f, -6028.959473f, 7.675705f);
AddWaypoint(11, 2202.595947f, -6061.325684f, 5.882018f);
AddWaypoint(12, 2188.974609f, -6080.866699f, 3.370027f);
if (urand(0,1))
{
AddWaypoint(13, 2176.483887, -6110.407227, 1.855181);
AddWaypoint(14, 2172.516602, -6146.752441, 1.074235);
AddWaypoint(15, 2138.918457, -6158.920898, 1.342926);
AddWaypoint(16, 2129.866699, -6174.107910, 4.380779);
AddWaypoint(17, 2117.709473, -6193.830078, 13.3542, 10000);
AddWaypoint(13, 2176.483887f, -6110.407227f, 1.855181f);
AddWaypoint(14, 2172.516602f, -6146.752441f, 1.074235f);
AddWaypoint(15, 2138.918457f, -6158.920898f, 1.342926f);
AddWaypoint(16, 2129.866699f, -6174.107910f, 4.380779f);
AddWaypoint(17, 2117.709473f, -6193.830078f, 13.3542f, 10000);
}
else
{
AddWaypoint(13, 2184.190186, -6166.447266, 0.968877);
AddWaypoint(14, 2234.265625, -6163.741211, 0.916021);
AddWaypoint(15, 2268.071777, -6158.750977, 1.822252);
AddWaypoint(16, 2270.028320, -6176.505859, 6.340538);
AddWaypoint(17, 2271.739014, -6195.401855, 13.3542, 10000);
AddWaypoint(13, 2184.190186f, -6166.447266f, 0.968877f);
AddWaypoint(14, 2234.265625f, -6163.741211f, 0.916021f);
AddWaypoint(15, 2268.071777f, -6158.750977f, 1.822252f);
AddWaypoint(16, 2270.028320f, -6176.505859f, 6.340538f);
AddWaypoint(17, 2271.739014f, -6195.401855f, 13.3542f, 10000);
}
}
@@ -1073,7 +1073,7 @@ public:
if (pPlayer->GetQuestStatus(12701) == QUEST_STATUS_INCOMPLETE)
{
// Hack Why Trinity Dont Support Custom Summon Location
if (Creature *miner = pPlayer->SummonCreature(28841, 2383.869629, -5900.312500, 107.996086, pPlayer->GetOrientation(),TEMPSUMMON_DEAD_DESPAWN, 1))
if (Creature *miner = pPlayer->SummonCreature(28841, 2383.869629f, -5900.312500f, 107.996086f, pPlayer->GetOrientation(),TEMPSUMMON_DEAD_DESPAWN, 1))
{
pPlayer->CastSpell(pPlayer, SPELL_CART_SUMM, true);
if (Creature *car = pPlayer->GetVehicleCreatureBase())
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+2 -2
View File
@@ -271,7 +271,7 @@ public:
void SummonAcolyte(uint32 uiAmount)
{
for (uint32 i = 0; i < uiAmount; ++i)
me->SummonCreature(NPC_CRIMSON_ACOLYTE, 1642.329, -6045.818, 127.583, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
me->SummonCreature(NPC_CRIMSON_ACOLYTE, 1642.329f, -6045.818f, 127.583f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
}
void UpdateAI(const uint32 uiDiff)
@@ -301,7 +301,7 @@ public:
break;
case 3:
DoScriptText(SAY_BREAKOUT6, me);
me->SummonCreature(NPC_HIGH_INQUISITOR_VALROTH, 1642.329, -6045.818, 127.583, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000);
me->SummonCreature(NPC_HIGH_INQUISITOR_VALROTH, 1642.329f, -6045.818f, 127.583f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000);
m_uiWave_Timer = 1000;
break;
case 4:
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+32 -32
View File
@@ -251,36 +251,36 @@ void UpdateWorldState(Map *map, uint32 id, uint32 state)
static Locations LightofDawnLoc[]=
{
{2281.335, -5300.409, 85.170, 0}, // 0 Tirion Fordring loc
{2283.896, -5287.914, 83.066, 1.55}, // 1 Tirion Fordring loc2
{2281.461, -5263.014, 81.164, 0}, // 2 Tirion charges
{2262.277, -5293.477, 82.167, 0}, // 3 Tirion run
{2270.286, -5287.73, 82.262, 0}, // 4 Tirion relocate
{2269.511, -5288.289, 82.225, 0}, // 5 Tirion forward
{2262.277, -5293.477, 82.167, 0}, // 6 Tirion runs to Darion
{2270.286, -5287.73, 82.262, 0},
{2269.511, -5288.289, 82.225, 0},
{2273.205, -5288.848, 82.617, 0}, // 9 Korfax loc1
{2274.739, -5287.926, 82.684, 0}, // 10 Korfax loc2
{2253.673, -5318.004, 81.724, 0}, // 11 Korfax kicked
{2287.028, -5309.644, 87.253, 0}, // 12 Maxwell loc1
{2286.978, -5308.025, 86.83, 0}, // 13 Maxwell loc2
{2248.877, -5307.586, 82.166, 0}, // 14 maxwell kicked
{2278.58, -5316.933, 88.319, 0}, // 15 Eligor loc1
{2278.535, -5315.479, 88.08, 0}, // 16 Eligor loc2
{2259.416, -5304.505, 82.149, 0}, // 17 eligor kicked
{2289.259, -5280.355, 82.112, 0}, // 18 Koltira loc1
{2289.02, -5281.985, 82.207, 0}, // 19 Koltira loc2
{2273.289, -5273.675, 81.701, 0}, // 20 Thassarian loc1
{2273.332, -5275.544, 81.849, 0}, // 21 Thassarian loc2
{2281.198, -5257.397, 80.224, 4.66}, // 22 Alexandros loc1
{2281.156, -5259.934, 80.647, 0}, // 23 Alexandros loc2
{2281.294, -5281.895, 82.445, 1.35}, // 24 Darion loc1
{2281.093, -5263.013, 81.125, 0}, // 25 Darion loc1
{2281.313, -5250.282, 79.322, 4.69}, // 26 Lich King spawns
{2281.523, -5261.058, 80.877, 0}, // 27 Lich king move forwards
{2272.709, -5255.552, 78.226, 0}, // 28 Lich king kicked
{2273.972, -5257.676, 78.862, 0} // 29 Lich king moves forward
{2281.335f, -5300.409f, 85.170f, 0}, // 0 Tirion Fordring loc
{2283.896f, -5287.914f, 83.066f, 1.55f}, // 1 Tirion Fordring loc2
{2281.461f, -5263.014f, 81.164f, 0}, // 2 Tirion charges
{2262.277f, -5293.477f, 82.167f, 0}, // 3 Tirion run
{2270.286f, -5287.73f, 82.262f, 0}, // 4 Tirion relocate
{2269.511f, -5288.289f, 82.225f, 0}, // 5 Tirion forward
{2262.277f, -5293.477f, 82.167f, 0}, // 6 Tirion runs to Darion
{2270.286f, -5287.73f, 82.262f, 0},
{2269.511f, -5288.289f, 82.225f, 0},
{2273.205f, -5288.848f, 82.617f, 0}, // 9 Korfax loc1
{2274.739f, -5287.926f, 82.684f, 0}, // 10 Korfax loc2
{2253.673f, -5318.004f, 81.724f, 0}, // 11 Korfax kicked
{2287.028f, -5309.644f, 87.253f, 0}, // 12 Maxwell loc1
{2286.978f, -5308.025f, 86.83f, 0}, // 13 Maxwell loc2
{2248.877f, -5307.586f, 82.166f, 0}, // 14 maxwell kicked
{2278.58f, -5316.933f, 88.319f, 0}, // 15 Eligor loc1
{2278.535f, -5315.479f, 88.08f, 0}, // 16 Eligor loc2
{2259.416f, -5304.505f, 82.149f, 0}, // 17 eligor kicked
{2289.259f, -5280.355f, 82.112f, 0}, // 18 Koltira loc1
{2289.02f, -5281.985f, 82.207f, 0}, // 19 Koltira loc2
{2273.289f, -5273.675f, 81.701f, 0}, // 20 Thassarian loc1
{2273.332f, -5275.544f, 81.849f, 0}, // 21 Thassarian loc2
{2281.198f, -5257.397f, 80.224f, 4.66f}, // 22 Alexandros loc1
{2281.156f, -5259.934f, 80.647f, 0}, // 23 Alexandros loc2
{2281.294f, -5281.895f, 82.445f, 1.35f}, // 24 Darion loc1
{2281.093f, -5263.013f, 81.125f, 0}, // 25 Darion loc1
{2281.313f, -5250.282f, 79.322f, 4.69f}, // 26 Lich King spawns
{2281.523f, -5261.058f, 80.877f, 0}, // 27 Lich king move forwards
{2272.709f, -5255.552f, 78.226f, 0}, // 28 Lich king kicked
{2273.972f, -5257.676f, 78.862f, 0} // 29 Lich king moves forward
};
class npc_highlord_darion_mograine : public CreatureScript
@@ -1133,7 +1133,7 @@ public:
case 48: // Show the cleansing effect (dawn of light)
//if (GameObject* pGo = me->GetMap()->GetGameObject(uiDawnofLightGUID))
// pGo->SetPhaseMask(128, true);
me->SummonGameObject(GO_LIGHT_OF_DAWN, 2283.896, -5287.914, 83.066, 0, 0, 0, 0, 0, 30000);
me->SummonGameObject(GO_LIGHT_OF_DAWN, 2283.896f, -5287.914f, 83.066f, 0, 0, 0, 0, 0, 30000);
if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID))
{
if (pTemp->HasAura(SPELL_REBIRTH_OF_THE_ASHBRINGER, 0))
@@ -1411,7 +1411,7 @@ public:
if (uiFight_duration <= diff + 5000)
{
if (!uiTirionGUID)
if (Unit* pTemp = me->SummonCreature(NPC_HIGHLORD_TIRION_FORDRING, LightofDawnLoc[0].x, LightofDawnLoc[0].y, LightofDawnLoc[0].z, 1.528, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000))
if (Unit* pTemp = me->SummonCreature(NPC_HIGHLORD_TIRION_FORDRING, LightofDawnLoc[0].x, LightofDawnLoc[0].y, LightofDawnLoc[0].z, 1.528f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000))
{
pTemp->setFaction(me->getFaction());
pTemp->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 0, uint32(EQUIP_UNEQUIP));