josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Fix build.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-11 15:34:31 -05:00
parent d697fbd158
commit 22529d80a4
10 changed files with 40 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp
+1 -1
View File
@@ -125,7 +125,7 @@ struct TRINITY_DLL_DECL npc_draenei_survivorAI : public ScriptedAI
{
m_creature->RemoveAurasDueToSpell(SPELL_IRRIDATION);
if (Player *pPlayer = (Player*)Unit::GetUnit(*m_creature,pCaster))
if (Player *pPlayer = Unit::GetPlayer(pCaster))
{
if (pPlayer->GetTypeId() != TYPEID_PLAYER)
return;
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
+5 -5
View File
@@ -331,7 +331,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI
pet = false;
Creature *Pet = (Creature*) Unit::GetUnit(*m_creature, SummonedPet);
Creature *Pet = Unit::GetCreature(*m_creature, SummonedPet);
if( Pet && Pet->isAlive() )
{
Pet->DealDamage( Pet, Pet->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false );
@@ -348,7 +348,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI
if (pInstance)
{
Creature *Karathress = NULL;
Karathress = (Creature*)(Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESS)));
Karathress = (Unit::GetCreature((*m_creature), pInstance->GetData64(DATA_KARATHRESS)));
if (Karathress)
((boss_fathomlord_karathressAI*)Karathress->AI())->EventSharkkisDeath();
@@ -407,7 +407,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI
if(TheBeastWithin_Timer < diff)
{
DoCast(m_creature, SPELL_THE_BEAST_WITHIN);
Creature *Pet = (Creature*) Unit::GetUnit(*m_creature, SummonedPet);
Creature *Pet = Unit::GetCreature(*m_creature, SummonedPet);
if( Pet && Pet->isAlive() )
{
Pet->CastSpell( Pet, SPELL_PET_ENRAGE, true );
@@ -477,7 +477,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_tidalvessAI : public ScriptedAI
if (pInstance)
{
Creature *Karathress = NULL;
Karathress = (Creature*)(Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESS)));
Karathress = (Unit::GetCreature((*m_creature), pInstance->GetData64(DATA_KARATHRESS)));
if (Karathress)
if(!m_creature->isAlive() && Karathress)
@@ -592,7 +592,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI
if (pInstance)
{
Creature *Karathress = NULL;
Karathress = (Creature*)(Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESS)));
Karathress = (Unit::GetCreature((*m_creature), pInstance->GetData64(DATA_KARATHRESS)));
if (Karathress)
if(!m_creature->isAlive() && Karathress)
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
+2 -2
View File
@@ -707,7 +707,7 @@ struct TRINITY_DLL_DECL mob_tainted_elementalAI : public ScriptedAI
if(pInstance)
{
Creature *Vashj = NULL;
Vashj = (Creature*)(Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_LADYVASHJ)));
Vashj = (Unit::GetCreature((*m_creature), pInstance->GetData64(DATA_LADYVASHJ)));
if(Vashj)
((boss_lady_vashjAI*)Vashj->AI())->EventTaintedElementalDeath();
@@ -941,7 +941,7 @@ bool ItemUse_item_tainted_core(Player *player, Item* _Item, SpellCastTargets con
}
Creature *Vashj = NULL;
Vashj = (Creature*)(Unit::GetUnit((*player), pInstance->GetData64(DATA_LADYVASHJ)));
Vashj = (Unit::GetCreature((*player), pInstance->GetData64(DATA_LADYVASHJ)));
if(Vashj && ((boss_lady_vashjAI*)Vashj->AI())->Phase == 2)
{
if(targets.getGOTarget() && targets.getGOTarget()->GetTypeId()==TYPEID_GAMEOBJECT)
src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp
+10 -10
View File
@@ -88,11 +88,11 @@ bool CheckAllBossDied(ScriptedInstance* pInstance, Creature* m_creature)
OlmGUID = pInstance->GetData64(DATA_OLMTHESUMMONER);
KroshGUID = pInstance->GetData64(DATA_KROSHFIREHAND);
Maulgar = ((Creature*)Unit::GetUnit((*m_creature), MaulgarGUID));
Kiggler = ((Creature*)Unit::GetUnit((*m_creature), KigglerGUID));
Blindeye = ((Creature*)Unit::GetUnit((*m_creature), BlindeyeGUID));
Olm = ((Creature*)Unit::GetUnit((*m_creature), OlmGUID));
Krosh = ((Creature*)Unit::GetUnit((*m_creature), KroshGUID));
Maulgar = (Unit::GetCreature((*m_creature), MaulgarGUID));
Kiggler = (Unit::GetCreature((*m_creature), KigglerGUID));
Blindeye = (Unit::GetCreature((*m_creature), BlindeyeGUID));
Olm = (Unit::GetCreature((*m_creature), OlmGUID));
Krosh = (Unit::GetCreature((*m_creature), KroshGUID));
if(!Maulgar || !Kiggler || !Blindeye || !Olm || !Krosh)
return false;
@@ -142,7 +142,7 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI
{
if(Council[i])
{
pCreature = (Creature*)(Unit::GetUnit((*m_creature), Council[i]));
pCreature = (Unit::GetCreature((*m_creature), Council[i]));
if(pCreature && !pCreature->isAlive())
{
pCreature->Respawn();
@@ -337,7 +337,7 @@ struct TRINITY_DLL_DECL boss_olm_the_summonerAI : public ScriptedAI
if(pInstance)
{
Creature *Maulgar = NULL;
Maulgar = (Creature*)(Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAR)));
Maulgar = (Unit::GetCreature((*m_creature), pInstance->GetData64(DATA_MAULGAR)));
if(Maulgar)
((boss_high_king_maulgarAI*)Maulgar->AI())->AddDeath();
@@ -441,7 +441,7 @@ struct TRINITY_DLL_DECL boss_kiggler_the_crazedAI : public ScriptedAI
if(pInstance)
{
Creature *Maulgar = NULL;
Maulgar = (Creature*)(Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAR)));
Maulgar = (Unit::GetCreature((*m_creature), pInstance->GetData64(DATA_MAULGAR)));
if(Maulgar)
((boss_high_king_maulgarAI*)Maulgar->AI())->AddDeath();
@@ -549,7 +549,7 @@ struct TRINITY_DLL_DECL boss_blindeye_the_seerAI : public ScriptedAI
if(pInstance)
{
Creature *Maulgar = NULL;
Maulgar = (Creature*)(Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAR)));
Maulgar = (Unit::GetCreature((*m_creature), pInstance->GetData64(DATA_MAULGAR)));
if(Maulgar)
((boss_high_king_maulgarAI*)Maulgar->AI())->AddDeath();
@@ -647,7 +647,7 @@ struct TRINITY_DLL_DECL boss_krosh_firehandAI : public ScriptedAI
if(pInstance)
{
Creature *Maulgar = NULL;
Maulgar = (Creature*)(Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAR)));
Maulgar = (Unit::GetCreature((*m_creature), pInstance->GetData64(DATA_MAULGAR)));
if(Maulgar)
((boss_high_king_maulgarAI*)Maulgar->AI())->AddDeath();
src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp
+6 -6
View File
@@ -1140,7 +1140,7 @@ void boss_julianneAI::DamageTaken(Unit* done_by, uint32 &damage)
DoCast(m_creature, SPELL_DRINK_POISON);
IsFakingDeath = true;
//IS THIS USEFULL? Creature* Julianne = ((Creature*)Unit::GetUnit((*m_creature), JulianneGUID));
//IS THIS USEFULL? Creature* Julianne = (Unit::GetCreature((*m_creature), JulianneGUID));
return;
}
@@ -1156,7 +1156,7 @@ void boss_julianneAI::DamageTaken(Unit* done_by, uint32 &damage)
//if this is true then we have to kill romulo too
if (RomuloDead)
{
if (Creature* Romulo = ((Creature*)Unit::GetUnit((*m_creature), RomuloGUID)))
if (Creature* Romulo = (Unit::GetCreature((*m_creature), RomuloGUID)))
{
Romulo->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
Romulo->GetMotionMaster()->Clear();
@@ -1170,7 +1170,7 @@ void boss_julianneAI::DamageTaken(Unit* done_by, uint32 &damage)
}
//if not already returned, then romulo is alive and we can pretend die
if (Creature* Romulo = ((Creature*)Unit::GetUnit((*m_creature), RomuloGUID)))
if (Creature* Romulo = (Unit::GetCreature((*m_creature), RomuloGUID)))
{
PretendToDie(m_creature);
IsFakingDeath = true;
@@ -1197,7 +1197,7 @@ void boss_romuloAI::DamageTaken(Unit* done_by, uint32 &damage)
IsFakingDeath = true;
Phase = PHASE_BOTH;
if (Creature* Julianne = ((Creature*)Unit::GetUnit((*m_creature), JulianneGUID)))
if (Creature* Julianne = (Unit::GetCreature((*m_creature), JulianneGUID)))
{
((boss_julianneAI*)Julianne->AI())->RomuloDead = true;
((boss_julianneAI*)Julianne->AI())->ResurrectSelfTimer = 10000;
@@ -1211,7 +1211,7 @@ void boss_romuloAI::DamageTaken(Unit* done_by, uint32 &damage)
{
if (JulianneDead)
{
if (Creature* Julianne = ((Creature*)Unit::GetUnit((*m_creature), JulianneGUID)))
if (Creature* Julianne = (Unit::GetCreature((*m_creature), JulianneGUID)))
{
Julianne->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
Julianne->GetMotionMaster()->Clear();
@@ -1223,7 +1223,7 @@ void boss_romuloAI::DamageTaken(Unit* done_by, uint32 &damage)
return;
}
if (Creature* Julianne = ((Creature*)Unit::GetUnit((*m_creature), JulianneGUID)))
if (Creature* Julianne = (Unit::GetCreature((*m_creature), JulianneGUID)))
{
PretendToDie(m_creature);
IsFakingDeath = true;
src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp
+1 -1
View File
@@ -180,7 +180,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI
uint32 n = 0;
for(std::vector<Add*>::iterator i = Adds.begin(); i != Adds.end(); ++i, ++n)
{
Creature* pAdd = ((Creature*)Unit::GetUnit(*m_creature, (*i)->guid));
Creature* pAdd = (Unit::GetCreature(*m_creature, (*i)->guid));
if(pAdd && pAdd->isAlive())
{
pAdd->AI()->EnterEvadeMode(); // Force them out of combat and reset if they are in combat.
src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp
+13 -13
View File
@@ -191,7 +191,7 @@ struct TRINITY_DLL_DECL advisorbase_ai : public ScriptedAI
if(pInstance && (pInstance->GetData(DATA_KAELTHASEVENT) == 1 || pInstance->GetData(DATA_KAELTHASEVENT) == 3))
{
Creature *Kaelthas = NULL;
Kaelthas = (Creature*)(Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KAELTHAS)));
Kaelthas = (Unit::GetCreature((*m_creature), pInstance->GetData64(DATA_KAELTHAS)));
if(Kaelthas)
Kaelthas->AI()->EnterEvadeMode();
@@ -325,7 +325,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
}
if(pInstance) {
for(uint32 i = 0; i < 7; i++) {
Creature* weapon = (Creature*)(Unit::GetUnit((*m_creature), WeaponGuid[i]));;
Creature* weapon = (Unit::GetCreature((*m_creature), WeaponGuid[i]));;
delete weapon;
}
}
@@ -393,7 +393,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
Creature *pCreature;
for(uint8 i = 0; i < 4; ++i)
{
pCreature = (Creature*)(Unit::GetUnit((*m_creature), AdvisorGuid[i]));
pCreature = (Unit::GetCreature((*m_creature), AdvisorGuid[i]));
if(pCreature)
{
pCreature->Respawn();
@@ -483,7 +483,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
Creature *pCreature;
for(uint8 i = 0; i < 4; ++i)
{
pCreature = (Creature*)(Unit::GetUnit((*m_creature), AdvisorGuid[i]));
pCreature = (Unit::GetCreature((*m_creature), AdvisorGuid[i]));
if(pCreature)
{
pCreature->DealDamage(pCreature, pCreature->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
@@ -550,7 +550,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
case 1:
if(Phase_Timer < diff)
{
Advisor = (Creature*)(Unit::GetUnit((*m_creature), AdvisorGuid[0]));
Advisor = (Unit::GetCreature((*m_creature), AdvisorGuid[0]));
if(Advisor)
{
@@ -568,7 +568,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
//Subphase 2 - Start
case 2:
Advisor = (Creature*)(Unit::GetUnit((*m_creature), AdvisorGuid[0]));
Advisor = (Unit::GetCreature((*m_creature), AdvisorGuid[0]));
if(Advisor && (Advisor->GetUInt32Value(UNIT_FIELD_BYTES_1) == UNIT_STAND_STATE_DEAD))
{
DoScriptText(SAY_INTRO_SANGUINAR, m_creature);
@@ -584,7 +584,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
case 3:
if(Phase_Timer < diff)
{
Advisor = (Creature*)(Unit::GetUnit((*m_creature), AdvisorGuid[1]));
Advisor = (Unit::GetCreature((*m_creature), AdvisorGuid[1]));
if(Advisor)
{
@@ -602,7 +602,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
//Subphase 3 - Start
case 4:
Advisor = (Creature*)(Unit::GetUnit((*m_creature), AdvisorGuid[1]));
Advisor = (Unit::GetCreature((*m_creature), AdvisorGuid[1]));
if(Advisor && (Advisor->GetUInt32Value(UNIT_FIELD_BYTES_1) == UNIT_STAND_STATE_DEAD))
{
DoScriptText(SAY_INTRO_CAPERNIAN, m_creature);
@@ -618,7 +618,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
case 5:
if(Phase_Timer < diff)
{
Advisor = (Creature*)(Unit::GetUnit((*m_creature), AdvisorGuid[2]));
Advisor = (Unit::GetCreature((*m_creature), AdvisorGuid[2]));
if(Advisor)
{
@@ -636,7 +636,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
//Subphase 4 - Start
case 6:
Advisor = (Creature*)(Unit::GetUnit((*m_creature), AdvisorGuid[2]));
Advisor = (Unit::GetCreature((*m_creature), AdvisorGuid[2]));
if(Advisor && (Advisor->GetUInt32Value(UNIT_FIELD_BYTES_1) == UNIT_STAND_STATE_DEAD))
{
DoScriptText(SAY_INTRO_TELONICUS, m_creature);
@@ -652,7 +652,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
case 7:
if(Phase_Timer < diff)
{
Advisor = (Creature*)(Unit::GetUnit((*m_creature), AdvisorGuid[3]));
Advisor = (Unit::GetCreature((*m_creature), AdvisorGuid[3]));
if(Advisor)
{
@@ -672,7 +672,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
//End of phase 1
case 8:
Advisor = (Creature*)(Unit::GetUnit((*m_creature), AdvisorGuid[3]));
Advisor = (Unit::GetCreature((*m_creature), AdvisorGuid[3]));
if(Advisor && (Advisor->GetUInt32Value(UNIT_FIELD_BYTES_1) == UNIT_STAND_STATE_DEAD))
{
Phase = 2;
@@ -742,7 +742,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
Creature* Advisor;
for (uint32 i = 0; i < 4; ++i)
{
Advisor = (Creature*)(Unit::GetUnit((*m_creature), AdvisorGuid[i]));
Advisor = (Unit::GetCreature((*m_creature), AdvisorGuid[i]));
if (!Advisor)
error_log("TSCR: Kael'Thas Advisor %u does not exist. Possibly despawned? Incorrectly Killed?", i);
else ((advisorbase_ai*)Advisor->AI())->Revive(Target);
src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_dalronn.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ struct TRINITY_DLL_DECL boss_dalronnAI : public ScriptedAI
if (Skarvald)
{
Creature* Skravald_m = ((Creature*)Unit::GetUnit((*m_creature), Skarvald));
Creature* Skravald_m = (Unit::GetCreature((*m_creature), Skarvald));
if (Skravald_m)
{
if (!Skravald_m->isAlive())
src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL boss_skarvaldAI : public ScriptedAI
if (Dalronn)
{
Creature* Dalronn_m = ((Creature*)Unit::GetUnit((*m_creature), Dalronn));
Creature* Dalronn_m = (Unit::GetCreature((*m_creature), Dalronn));
if (Dalronn_m)
{
if (!Dalronn_m->isAlive())
src/game/Unit.cpp
-11
View File
@@ -9555,19 +9555,8 @@ void Unit::Unmount()
// only resummon old pet if the player is already added to a map
// this prevents adding a pet to a not created map which would otherwise cause a crash
// (it could probably happen when logging in after a previous crash)
<<<<<<< HEAD:src/game/Unit.cpp
if(GetTypeId() == TYPEID_PLAYER && IsInWorld() && ((Player*)this)->GetTemporaryUnsummonedPetNumber() && isAlive())
{
Pet* NewPet = new Pet((Player*)this);
if(!NewPet->LoadPetFromDB((Player*)this, 0, ((Player*)this)->GetTemporaryUnsummonedPetNumber(), true))
delete NewPet;
((Player*)this)->SetTemporaryUnsummonedPetNumber(0);
}
=======
if(GetTypeId() == TYPEID_PLAYER)
((Player*)this)->ResummonPetTemporaryUnSummonedIfAny();
>>>>>>> 661760f287d94dbbe8f5224b19ba4181c7d62910:src/game/Unit.cpp
}
void Unit::SetInCombatWith(Unit* enemy)