Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14491 from doctaweeks/fixes-for-6.x

Browse Source 
Fixes for 6.x
This commit is contained in:
Carbenium
2015-04-05 00:16:36 +02:00
parent f09af70583 96c6ed1867
commit 6252330a77
59 changed files with 89 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
View File

@@ -421,7 +421,7 @@ public:
gossipStep = 0;
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (who && !who->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC))
npc_escortAI::AttackStart(who);

4
src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
View File

@@ -177,7 +177,7 @@ class npc_harbinger_of_flame : public CreatureScript
{
}
void EnterCombat(Unit* /*target*/)
void EnterCombat(Unit* /*target*/) override
{
if (Creature* bird = ObjectAccessor::GetCreature(*me, me->GetChannelObjectGuid()))
DoZoneInCombat(bird, 200.0f);
@@ -277,7 +277,7 @@ class npc_blazing_monstrosity : public CreatureScript
AlysrazorTrashEvaded(me);
}
void EnterCombat(Unit* /*target*/)
void EnterCombat(Unit* /*target*/) override
{
DoZoneInCombat();
me->RemoveAurasDueToSpell(SPELL_SLEEP_ULTRA_HIGH_PRIORITY);

2
src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
View File

@@ -76,7 +76,7 @@ public:
}
}
void Update(uint32 /*diff*/)
void Update(uint32 /*diff*/) override
{
if (WardKeeperDeath == WARD_KEEPERS_NR)
if (GameObject* go = instance->GetGameObject(DoorWardGUID))

2
src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
View File

@@ -57,7 +57,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript
}
}
bool SetBossState(uint32 bossId, EncounterState state)
bool SetBossState(uint32 bossId, EncounterState state) override
{
if (!InstanceScript::SetBossState(bossId, state))
return false;

10
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
View File

@@ -99,7 +99,7 @@ struct boss_twinemperorsAI : public ScriptedAI
uint32 EnrageTimer;
virtual bool IAmVeklor() = 0;
virtual void Reset() = 0;
virtual void Reset() override = 0;
virtual void CastSpellOnBug(Creature* target) = 0;
void TwinReset()
@@ -400,7 +400,7 @@ public:
struct boss_veknilashAI : public boss_twinemperorsAI
{
bool IAmVeklor() {return false;}
bool IAmVeklor() override {return false;}
boss_veknilashAI(Creature* creature) : boss_twinemperorsAI(creature)
{
Initialize();
@@ -425,7 +425,7 @@ public:
me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true);
}
void CastSpellOnBug(Creature* target)
void CastSpellOnBug(Creature* target) override
{
target->setFaction(14);
target->AI()->AttackStart(me->getThreatManager().getHostilTarget());
@@ -488,7 +488,7 @@ public:
struct boss_veklorAI : public boss_twinemperorsAI
{
bool IAmVeklor() {return true;}
bool IAmVeklor() override {return true;}
boss_veklorAI(Creature* creature) : boss_twinemperorsAI(creature)
{
Initialize();
@@ -516,7 +516,7 @@ public:
me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, true);
}
void CastSpellOnBug(Creature* target)
void CastSpellOnBug(Creature* target) override
{
target->setFaction(14);
target->AddAura(SPELL_EXPLODEBUG, target);

2
src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
View File

@@ -220,7 +220,7 @@ public:
};
}
virtual void Update(uint32 diff)
virtual void Update(uint32 diff) override
{
switch (PyramidPhase)
{

6
src/server/scripts/Kalimdor/zone_ashenvale.cpp
View File

@@ -85,7 +85,7 @@ public:
summoned->AI()->AttackStart(me);
}
void sQuestAccept(Player* player, Quest const* quest)
void sQuestAccept(Player* player, Quest const* quest) override
{
if (quest->GetQuestId() == QUEST_TOREK_ASSULT)
{
@@ -204,7 +204,7 @@ public:
summoned->AI()->AttackStart(me);
}
void sQuestAccept(Player* player, Quest const* quest)
void sQuestAccept(Player* player, Quest const* quest) override
{
if (quest->GetQuestId() == QUEST_FREEDOM_TO_RUUL)
{
@@ -346,7 +346,7 @@ public:
summoned->AI()->AttackStart(me);
}
void sQuestAccept(Player* player, Quest const* quest)
void sQuestAccept(Player* player, Quest const* quest) override
{
if (quest->GetQuestId() == QUEST_VORSHA)
{

2
src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
View File

@@ -350,7 +350,7 @@ public:
Talk(SAY_AGGRO, who);
}
void sQuestAccept(Player* player, Quest const* quest)
void sQuestAccept(Player* player, Quest const* quest) override
{
if (quest->GetQuestId() == QUEST_A_CRY_FOR_SAY_HELP)
{

4
src/server/scripts/Kalimdor/zone_durotar.cpp
View File

@@ -69,13 +69,13 @@ public:
Initialize();
}
void MovementInform(uint32 /*type*/, uint32 id)
void MovementInform(uint32 /*type*/, uint32 id) override
{
if (id == 1)
work = true;
}
void SpellHit(Unit* caster, const SpellInfo* spell)
void SpellHit(Unit* caster, const SpellInfo* spell) override
{
if (spell->Id != SPELL_AWAKEN_PEON)
return;

18
src/server/scripts/Kalimdor/zone_tanaris.cpp
View File

@@ -111,7 +111,7 @@ public:
}
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
Talk(AGGRO_YELL_AQUE, who);
}
@@ -197,7 +197,7 @@ public:
{
npc_custodian_of_timeAI(Creature* creature) : npc_escortAI(creature) { }
void WaypointReached(uint32 waypointId)
void WaypointReached(uint32 waypointId) override
{
if (Player* player = GetPlayerForEscort())
{
@@ -264,7 +264,7 @@ public:
}
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (HasEscortState(STATE_ESCORT_ESCORTING))
return;
@@ -362,7 +362,7 @@ class npc_OOX17 : public CreatureScript
public:
npc_OOX17() : CreatureScript("npc_OOX17") { }
bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override
{
if (quest->GetQuestId() == Q_OOX17)
{
@@ -387,7 +387,7 @@ public:
{
npc_OOX17AI(Creature* creature) : npc_escortAI(creature) { }
void WaypointReached(uint32 waypointId)
void WaypointReached(uint32 waypointId) override
{
if (Player* player = GetPlayerForEscort())
{
@@ -457,7 +457,7 @@ class npc_tooga : public CreatureScript
public:
npc_tooga() : CreatureScript("npc_tooga") { }
bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest)
bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override
{
if (quest->GetQuestId() == QUEST_TOOGA)
{
@@ -500,7 +500,7 @@ public:
Initialize();
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
FollowerAI::MoveInLineOfSight(who);
@@ -518,7 +518,7 @@ public:
}
}
void MovementInform(uint32 MotionType, uint32 PointId)
void MovementInform(uint32 MotionType, uint32 PointId) override
{
FollowerAI::MovementInform(MotionType, PointId);
@@ -529,7 +529,7 @@ public:
SetFollowComplete();
}
void UpdateFollowerAI(uint32 Diff)
void UpdateFollowerAI(uint32 Diff) override
{
if (!UpdateVictim())
{

4
src/server/scripts/Kalimdor/zone_winterspring.cpp
View File

@@ -451,7 +451,7 @@ public:
}
}
void JustDidDialogueStep(int32 entry)
void JustDidDialogueStep(int32 entry) override
{
switch (entry)
{
@@ -550,7 +550,7 @@ public:
}
}
Creature* GetSpeakerByEntry(int32 entry)
Creature* GetSpeakerByEntry(int32 entry) override
{
switch (entry)
{