*Remove useless escortAI cast.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-06-04 16:42:31 -05:00
parent 853021b274
commit 0f531569a0
8 changed files with 94 additions and 94 deletions
@@ -860,7 +860,7 @@ struct TRINITY_DLL_DECL npc_marshal_reginald_windsorAI : public npc_escortAI
if( m_creature->IsWithinDistInMap(who, Radius) ) if( m_creature->IsWithinDistInMap(who, Radius) )
{ {
IsOnHold = false; IsOnHold = false;
((npc_escortAI*)(m_creature->AI()))->Start(true, true, false, who->GetGUID()); Start(true, true, false, who->GetGUID());
} }
} }
} }
@@ -128,16 +128,16 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI
go = true; go = true;
if(pInstance) if(pInstance)
{ {
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(0, 4896.08, -1576.35, 1333.65); AddWaypoint(0, 4896.08, -1576.35, 1333.65);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(1, 4898.68, -1615.02, 1329.48); AddWaypoint(1, 4898.68, -1615.02, 1329.48);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(2, 4907.12, -1667.08, 1321.00); AddWaypoint(2, 4907.12, -1667.08, 1321.00);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(3, 4963.18, -1699.35, 1340.51); AddWaypoint(3, 4963.18, -1699.35, 1340.51);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(4, 4989.16, -1716.67, 1335.74); AddWaypoint(4, 4989.16, -1716.67, 1335.74);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(5, 5026.27, -1736.89, 1323.02); AddWaypoint(5, 5026.27, -1736.89, 1323.02);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(6, 5037.77, -1770.56, 1324.36); AddWaypoint(6, 5037.77, -1770.56, 1324.36);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(7, 5067.23, -1789.95, 1321.17); AddWaypoint(7, 5067.23, -1789.95, 1321.17);
((npc_escortAI*)(m_creature->AI()))->Start(false, true, true); Start(false, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
} }
} }
} }
@@ -120,16 +120,16 @@ struct TRINITY_DLL_DECL boss_azgalorAI : public hyjal_trashAI
go = true; go = true;
if(pInstance) if(pInstance)
{ {
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(0, 5492.91, -2404.61, 1462.63); AddWaypoint(0, 5492.91, -2404.61, 1462.63);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(1, 5531.76, -2460.87, 1469.55); AddWaypoint(1, 5531.76, -2460.87, 1469.55);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(2, 5554.58, -2514.66, 1476.12); AddWaypoint(2, 5554.58, -2514.66, 1476.12);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(3, 5554.16, -2567.23, 1479.90); AddWaypoint(3, 5554.16, -2567.23, 1479.90);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(4, 5540.67, -2625.99, 1480.89); AddWaypoint(4, 5540.67, -2625.99, 1480.89);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(5, 5508.16, -2659.2, 1480.15); AddWaypoint(5, 5508.16, -2659.2, 1480.15);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(6, 5489.62, -2704.05, 1482.18); AddWaypoint(6, 5489.62, -2704.05, 1482.18);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(7, 5457.04, -2726.26, 1485.10); AddWaypoint(7, 5457.04, -2726.26, 1485.10);
((npc_escortAI*)(m_creature->AI()))->Start(false, true, true); Start(false, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
} }
} }
} }
@@ -115,16 +115,16 @@ struct TRINITY_DLL_DECL boss_kazrogalAI : public hyjal_trashAI
go = true; go = true;
if(pInstance) if(pInstance)
{ {
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(0, 5492.91, -2404.61, 1462.63); AddWaypoint(0, 5492.91, -2404.61, 1462.63);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(1, 5531.76, -2460.87, 1469.55); AddWaypoint(1, 5531.76, -2460.87, 1469.55);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(2, 5554.58, -2514.66, 1476.12); AddWaypoint(2, 5554.58, -2514.66, 1476.12);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(3, 5554.16, -2567.23, 1479.90); AddWaypoint(3, 5554.16, -2567.23, 1479.90);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(4, 5540.67, -2625.99, 1480.89); AddWaypoint(4, 5540.67, -2625.99, 1480.89);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(5, 5508.16, -2659.2, 1480.15); AddWaypoint(5, 5508.16, -2659.2, 1480.15);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(6, 5489.62, -2704.05, 1482.18); AddWaypoint(6, 5489.62, -2704.05, 1482.18);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(7, 5457.04, -2726.26, 1485.10); AddWaypoint(7, 5457.04, -2726.26, 1485.10);
((npc_escortAI*)(m_creature->AI()))->Start(false, true, true); Start(false, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
} }
} }
} }
@@ -112,16 +112,16 @@ struct TRINITY_DLL_DECL boss_rage_winterchillAI : public hyjal_trashAI
go = true; go = true;
if(pInstance) if(pInstance)
{ {
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(0, 4896.08, -1576.35, 1333.65); AddWaypoint(0, 4896.08, -1576.35, 1333.65);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(1, 4898.68, -1615.02, 1329.48); AddWaypoint(1, 4898.68, -1615.02, 1329.48);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(2, 4907.12, -1667.08, 1321.00); AddWaypoint(2, 4907.12, -1667.08, 1321.00);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(3, 4963.18, -1699.35, 1340.51); AddWaypoint(3, 4963.18, -1699.35, 1340.51);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(4, 4989.16, -1716.67, 1335.74); AddWaypoint(4, 4989.16, -1716.67, 1335.74);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(5, 5026.27, -1736.89, 1323.02); AddWaypoint(5, 5026.27, -1736.89, 1323.02);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(6, 5037.77, -1770.56, 1324.36); AddWaypoint(6, 5037.77, -1770.56, 1324.36);
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(7, 5067.23, -1789.95, 1321.17); AddWaypoint(7, 5067.23, -1789.95, 1321.17);
((npc_escortAI*)(m_creature->AI()))->Start(false, true, true); Start(false, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
} }
} }
} }
@@ -473,9 +473,9 @@ struct mob_giant_infernalAI : public hyjal_trashAI
go = true; go = true;
if(pInstance) if(pInstance)
{ {
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(0, HordeWPs[7][0]+irand(-3,3), HordeWPs[7][1]+irand(-3,3), HordeWPs[7][2]);//HordeWPs[7] infront of thrall AddWaypoint(0, HordeWPs[7][0]+irand(-3,3), HordeWPs[7][1]+irand(-3,3), HordeWPs[7][2]);//HordeWPs[7] infront of thrall
((npc_escortAI*)(m_creature->AI()))->Start(true, true, true); Start(true, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
} }
} }
} }
@@ -566,15 +566,15 @@ struct mob_abominationAI : public hyjal_trashAI
if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
{ {
for (uint8 i = 0; i < 8; ++i) for (uint8 i = 0; i < 8; ++i)
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]);
((npc_escortAI*)(m_creature->AI()))->Start(false, true, true); Start(false, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
}else//use alliance WPs }else//use alliance WPs
{ {
for (uint8 i = 0; i < 8; ++i) for (uint8 i = 0; i < 8; ++i)
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]);
((npc_escortAI*)(m_creature->AI()))->Start(false, true, true); Start(false, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
} }
} }
} }
@@ -667,15 +667,15 @@ struct mob_ghoulAI : public hyjal_trashAI
if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
{ {
for (uint8 i = 0; i < 8; ++i) for (uint8 i = 0; i < 8; ++i)
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]);
((npc_escortAI*)(m_creature->AI()))->Start(false, true, true); Start(false, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
}else//use alliance WPs }else//use alliance WPs
{ {
for (uint8 i = 0; i < 8; ++i) for (uint8 i = 0; i < 8; ++i)
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]);
((npc_escortAI*)(m_creature->AI()))->Start(false, true, true); Start(false, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
} }
} }
} }
@@ -786,15 +786,15 @@ struct mob_necromancerAI : public hyjal_trashAI
if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
{ {
for (uint8 i = 0; i < 8; ++i) for (uint8 i = 0; i < 8; ++i)
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]);
((npc_escortAI*)(m_creature->AI()))->Start(true, true, true); Start(true, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
}else//use alliance WPs }else//use alliance WPs
{ {
for (uint8 i = 0; i < 8; ++i) for (uint8 i = 0; i < 8; ++i)
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]);
((npc_escortAI*)(m_creature->AI()))->Start(true, true, true); Start(true, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
} }
} }
} }
@@ -878,15 +878,15 @@ struct mob_bansheeAI : public hyjal_trashAI
if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
{ {
for (uint8 i = 0; i < 8; ++i) for (uint8 i = 0; i < 8; ++i)
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]);
((npc_escortAI*)(m_creature->AI()))->Start(false, true, true); Start(false, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
}else//use alliance WPs }else//use alliance WPs
{ {
for (uint8 i = 0; i < 8; ++i) for (uint8 i = 0; i < 8; ++i)
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]);
((npc_escortAI*)(m_creature->AI()))->Start(false, true, true); Start(false, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
} }
} }
} }
@@ -973,15 +973,15 @@ struct mob_crypt_fiendAI : public hyjal_trashAI
if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
{ {
for (uint8 i = 0; i < 8; ++i) for (uint8 i = 0; i < 8; ++i)
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]);
((npc_escortAI*)(m_creature->AI()))->Start(false, true, true); Start(false, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
}else//use alliance WPs }else//use alliance WPs
{ {
for (uint8 i = 0; i < 8; ++i) for (uint8 i = 0; i < 8; ++i)
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]);
((npc_escortAI*)(m_creature->AI()))->Start(false, true, true); Start(false, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
} }
} }
@@ -1059,15 +1059,15 @@ struct mob_fel_stalkerAI : public hyjal_trashAI
if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
{ {
for (uint8 i = 0; i < 8; ++i) for (uint8 i = 0; i < 8; ++i)
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]);
((npc_escortAI*)(m_creature->AI()))->Start(false, true, true); Start(false, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
}else//use alliance WPs }else//use alliance WPs
{ {
for (uint8 i = 0; i < 8; ++i) for (uint8 i = 0; i < 8; ++i)
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]);
((npc_escortAI*)(m_creature->AI()))->Start(false, true, true); Start(false, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
} }
} }
@@ -1160,14 +1160,14 @@ struct mob_frost_wyrmAI : public hyjal_trashAI
if(!useFlyPath) if(!useFlyPath)
{ {
for (uint8 i = 0; i < 3; ++i) for (uint8 i = 0; i < 3; ++i)
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(i, FrostWyrmWPs[i][0], FrostWyrmWPs[i][1], FrostWyrmWPs[i][2]); AddWaypoint(i, FrostWyrmWPs[i][0], FrostWyrmWPs[i][1], FrostWyrmWPs[i][2]);
((npc_escortAI*)(m_creature->AI()))->Start(false, true, true); Start(false, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
}else{//fly path FlyPathWPs }else{//fly path FlyPathWPs
for (uint8 i = 0; i < 3; ++i) for (uint8 i = 0; i < 3; ++i)
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(i, FlyPathWPs[i][0]+irand(-10,10), FlyPathWPs[i][1]+irand(-10,10), FlyPathWPs[i][2]); AddWaypoint(i, FlyPathWPs[i][0]+irand(-10,10), FlyPathWPs[i][1]+irand(-10,10), FlyPathWPs[i][2]);
((npc_escortAI*)(m_creature->AI()))->Start(false, true, true); Start(false, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
} }
} }
} }
@@ -1272,14 +1272,14 @@ struct mob_gargoyleAI : public hyjal_trashAI
if(!useFlyPath) if(!useFlyPath)
{ {
for (uint8 i = 0; i < 3; ++i) for (uint8 i = 0; i < 3; ++i)
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(i, GargoyleWPs[i][0]+irand(-10,10), GargoyleWPs[i][1]+irand(-10,10), GargoyleWPs[i][2]); AddWaypoint(i, GargoyleWPs[i][0]+irand(-10,10), GargoyleWPs[i][1]+irand(-10,10), GargoyleWPs[i][2]);
((npc_escortAI*)(m_creature->AI()))->Start(false, true, true); Start(false, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
}else{//fly path FlyPathWPs }else{//fly path FlyPathWPs
for (uint8 i = 0; i < 3; ++i) for (uint8 i = 0; i < 3; ++i)
((npc_escortAI*)(m_creature->AI()))->AddWaypoint(i, FlyPathWPs[i][0]+irand(-10,10), FlyPathWPs[i][1]+irand(-10,10), FlyPathWPs[i][2]); AddWaypoint(i, FlyPathWPs[i][0]+irand(-10,10), FlyPathWPs[i][1]+irand(-10,10), FlyPathWPs[i][2]);
((npc_escortAI*)(m_creature->AI()))->Start(false, true, true); Start(false, true, true);
((npc_escortAI*)(m_creature->AI()))->SetDespawnAtEnd(false); SetDespawnAtEnd(false);
} }
} }
} }
@@ -333,7 +333,7 @@ public:
float Radius = 10.0; float Radius = 10.0;
if( m_creature->IsWithinDistInMap(who, Radius) ) if( m_creature->IsWithinDistInMap(who, Radius) )
{ {
((npc_escortAI*)(m_creature->AI()))->Start(false, false, false, who->GetGUID()); Start(false, false, false, who->GetGUID());
} }
} }
} }
@@ -196,7 +196,7 @@ struct TRINITY_DLL_DECL npc_custodian_of_timeAI : public npc_escortAI
float Radius = 10.0; float Radius = 10.0;
if( m_creature->IsWithinDistInMap(who, Radius) ) if( m_creature->IsWithinDistInMap(who, Radius) )
{ {
((npc_escortAI*)(m_creature->AI()))->Start(false, false, false, who->GetGUID()); Start(false, false, false, who->GetGUID());
} }
} }
} }