Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Remove some not needed casts or used correct casts.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Anubisss
2009-09-20 19:58:06 +02:00
parent 77328defee
commit 43e61c2e27
5 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bindings/scripts/base/follower_ai.cpp
View File

@@ -289,7 +289,7 @@ void FollowerAI::StartFollow(Player* pLeader, uint32 uiFactionForFollower, const
Player* FollowerAI::GetLeaderForFollower()
{
if (Player* pLeader = (Player*)Unit::GetUnit(*m_creature, m_uiLeaderGUID))
if (Player* pLeader = Unit::GetPlayer(m_uiLeaderGUID))
{
if (pLeader->isAlive())
return pLeader;

34
src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp
View File

@@ -945,7 +945,7 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
DoScriptText(SAY_LIGHT_OF_DAWN51, pTemp);
if (Unit* pTirion = Unit::GetCreature(*me, uiTirionGUID))
{
((Unit*)pTirion)->SetStandState(UNIT_STAND_STATE_KNEEL);
pTirion->SetStandState(UNIT_STAND_STATE_KNEEL);
//pTemp->CastSpell(pTirion, SPELL_APOCALYPSE, false); // not working
pTemp->CastSpell(pTirion, SPELL_SOUL_FEAST_TIRION, false);
DoScriptText(EMOTE_LIGHT_OF_DAWN12, pTirion);
@@ -1018,33 +1018,33 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
{
pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
pTemp->SetSpeed(MOVE_RUN, 6.0f);
((Unit*)pTemp)->SetStandState(UNIT_STAND_STATE_DEAD);
pTemp->SetStandState(UNIT_STAND_STATE_DEAD);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[14].x, LightofDawnLoc[14].y, LightofDawnLoc[14].z);
}
if (Creature* pTemp = Unit::GetCreature(*me, uiKorfaxGUID))
{
pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
pTemp->SetSpeed(MOVE_RUN, 6.0f);
((Unit*)pTemp)->SetStandState(UNIT_STAND_STATE_DEAD);
pTemp->SetStandState(UNIT_STAND_STATE_DEAD);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[11].x, LightofDawnLoc[11].y, LightofDawnLoc[11].z);
}
if (Creature* pTemp = Unit::GetCreature(*me, uiEligorGUID))
{
pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
pTemp->SetSpeed(MOVE_RUN, 6.0f);
((Unit*)pTemp)->SetStandState(UNIT_STAND_STATE_DEAD);
pTemp->SetStandState(UNIT_STAND_STATE_DEAD);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[17].x, LightofDawnLoc[17].y, LightofDawnLoc[17].z);
}
if (Creature* pTemp = Unit::GetCreature(*me, uiDefenderGUID[0]))
{
pTemp->SetSpeed(MOVE_RUN, 6.0f);
((Unit*)pTemp)->SetStandState(UNIT_STAND_STATE_DEAD);
pTemp->SetStandState(UNIT_STAND_STATE_DEAD);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%10, LightofDawnLoc[0].y+rand()%10, LightofDawnLoc[0].z);
}
if (Creature* pTemp = Unit::GetCreature(*me, uiEarthshatterGUID[0]))
{
pTemp->SetSpeed(MOVE_RUN, 6.0f);
((Unit*)pTemp)->SetStandState(UNIT_STAND_STATE_DEAD);
pTemp->SetStandState(UNIT_STAND_STATE_DEAD);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%10, LightofDawnLoc[0].y+rand()%10, LightofDawnLoc[0].z);
}
JumpToNextStep(3000);
@@ -1052,11 +1052,11 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
case 44: // make them stand up
if (Creature* pTemp = Unit::GetCreature(*me, uiMaxwellGUID))
((Unit*)pTemp)->SetStandState(UNIT_STAND_STATE_STAND);
pTemp->SetStandState(UNIT_STAND_STATE_STAND);
if (Creature* pTemp = Unit::GetCreature(*me, uiKorfaxGUID))
((Unit*)pTemp)->SetStandState(UNIT_STAND_STATE_STAND);
pTemp->SetStandState(UNIT_STAND_STATE_STAND);
if (Creature* pTemp = Unit::GetCreature(*me, uiEligorGUID))
((Unit*)pTemp)->SetStandState(UNIT_STAND_STATE_STAND);
pTemp->SetStandState(UNIT_STAND_STATE_STAND);
JumpToNextStep(1000);
break;
@@ -1079,7 +1079,7 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
DoScriptText(EMOTE_LIGHT_OF_DAWN15, me);
if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID))
{
((Unit*)pTemp)->SetStandState(UNIT_STAND_STATE_STAND);
pTemp->SetStandState(UNIT_STAND_STATE_STAND);
pTemp->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 0, uint32(EQUIP_HIGHLORD_TIRION_FORDRING));
pTemp->CastSpell(pTemp, SPELL_REBIRTH_OF_THE_ASHBRINGER, false);
}
@@ -1153,13 +1153,13 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
case 55:
if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID))
((Unit*)pTemp)->SetStandState(UNIT_STAND_STATE_KNEEL);
pTemp->SetStandState(UNIT_STAND_STATE_KNEEL);
JumpToNextStep(2000);
break;
case 56:
if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID))
((Unit*)pTemp)->SetStandState(UNIT_STAND_STATE_STAND);
pTemp->SetStandState(UNIT_STAND_STATE_STAND);
JumpToNextStep(1500);
break;
@@ -1495,12 +1495,12 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
if (Unit* pTarger = SelectUnit(SELECT_TARGET_RANDOM,0))
if (pTarger->isAlive())
{
//((Creature*)pTemp)->DeleteThreatList();
((Creature*)pTemp)->AddThreat(pTarger, 0.0f);
((Creature*)pTemp)->AI()->AttackStart(pTarger);
((Creature*)pTemp)->SetInCombatWith(pTarger);
// pTemp->DeleteThreatList();
pTemp->AddThreat(pTarger, 0.0f);
pTemp->AI()->AttackStart(pTarger);
pTemp->SetInCombatWith(pTarger);
pTarger->SetInCombatWith(pTemp);
//((Creature*)pTemp)->GetMotionMaster()->MoveChase(pTarger, 20.0f);
// pTemp->GetMotionMaster()->MoveChase(pTarger, 20.0f);
}
}

2
src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp
View File

@@ -448,7 +448,7 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI
uint32 NextStep(uint32 Step)
{
Creature* Spark = (Creature*)Unit::GetUnit(*m_creature, SparkGUID);
Creature* Spark = Unit::GetCreature(*m_creature, SparkGUID);
switch(Step)
{

12
src/bindings/scripts/scripts/kalimdor/silithus.cpp
View File

@@ -1041,7 +1041,7 @@ bool GOQuestAccept_GO_crystalline_tear(Player* plr, GameObject* go, Quest const*
Unit *Caelestrasz = Anachronos_Quest_Trigger->SummonCreature(15379,-8032.767, 1533.148,2.61, 1.5,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,150000);
Unit *Arygos = Anachronos_Quest_Trigger->SummonCreature(15380,-8034.52, 1537.843, 2.61, 5.7,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,150000);
Unit *Fandral = Anachronos_Quest_Trigger->SummonCreature(15382,-8028.462, 1535.843, 2.61, 3.141592,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,215000);
Unit *Anachronos = Anachronos_Quest_Trigger->SummonCreature(15381,-8028.75, 1538.795, 2.61, 4,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000);
Creature *Anachronos = Anachronos_Quest_Trigger->SummonCreature(15381,-8028.75, 1538.795, 2.61, 4,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000);
if(Merithra)
{
@@ -1069,11 +1069,11 @@ bool GOQuestAccept_GO_crystalline_tear(Player* plr, GameObject* go, Quest const*
if(Anachronos)
{
((npc_anachronos_the_ancientAI*)((Creature*)Anachronos)->AI())->PlayerGUID = plr->GetGUID();
((npc_anachronos_quest_triggerAI*)((Creature*)Anachronos_Quest_Trigger)->AI())->Failed=false;
((npc_anachronos_quest_triggerAI*)((Creature*)Anachronos_Quest_Trigger)->AI())->PlayerGUID = plr->GetGUID();
((npc_anachronos_quest_triggerAI*)((Creature*)Anachronos_Quest_Trigger)->AI())->EventStarted=true;
( (npc_anachronos_quest_triggerAI*)((Creature*)Anachronos_Quest_Trigger)->AI())->Announced=true;
((npc_anachronos_the_ancientAI*)Anachronos->AI())->PlayerGUID = plr->GetGUID();
((npc_anachronos_quest_triggerAI*)CAST_CRE(Anachronos_Quest_Trigger)->AI())->Failed=false;
((npc_anachronos_quest_triggerAI*)CAST_CRE(Anachronos_Quest_Trigger)->AI())->PlayerGUID = plr->GetGUID();
((npc_anachronos_quest_triggerAI*)CAST_CRE(Anachronos_Quest_Trigger)->AI())->EventStarted=true;
((npc_anachronos_quest_triggerAI*)CAST_CRE(Anachronos_Quest_Trigger)->AI())->Announced=true;
}
}
}

2
src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp
View File

@@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL boss_kologarnAI : public BossAI
else if(who->GetEntry() == 32934)
right = apply;
who->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
((Creature*)who)->SetReactState(REACT_PASSIVE);
CAST_CRE(who)->SetReactState(REACT_PASSIVE);
}
}