Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-30 05:43:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Cleanup in Spell.h:

Browse Source 
- Codestyle (fix function naming) and cleanup changes in SpellCastTargets class, also access variables of this class by getters/setters
 - Move IsQuestTameSpell function to SpellMgr.h
 - Move UnitList typedef to Unit.h
Additionally - add missing copyright notice to SpellAuraEffects.h
This commit is contained in:
QAston
2011-06-23 13:28:52 +02:00
parent 9d9472e5cc
commit 3137a82c7c
19 changed files with 630 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
View File

@@ -47,8 +47,7 @@ public:
}
if (pInstance->GetData(EVENT_STATE)!= CANNON_NOT_USED)
return false;
if (targets.getGOTarget() && targets.getGOTarget()->GetTypeId() == TYPEID_GAMEOBJECT &&
targets.getGOTarget()->GetEntry() == GO_DEFIAS_CANNON)
if (targets.GetGOTarget() && targets.GetGOTarget()->GetEntry() == GO_DEFIAS_CANNON)
{
pInstance->SetData(EVENT_STATE, CANNON_GUNPOWDER_USED);
}

5
src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
View File

@@ -1478,9 +1478,10 @@ class spell_valanar_kinetic_bomb : public SpellScriptLoader
void ChangeSummonPos(SpellEffIndex /*effIndex*/)
{
WorldLocation* summonPos = GetTargetDest();
WorldLocation summonPos = *GetTargetDest();
Position offset = {0.0f, 0.0f, 20.0f, 0.0f};
summonPos->RelocateOffset(offset); // +20 in height
summonPos.RelocateOffset(offset);
SetTargetDest(summonPos);
}
void Register()

2
src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
View File

@@ -1260,7 +1260,7 @@ class spell_rimefang_icy_blast : public SpellScriptLoader
void HandleTriggerMissile(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
if (Position* pos = GetTargetDest())
if (Position const* pos = GetTargetDest())
if (TempSummon* summon = GetCaster()->SummonCreature(NPC_ICY_BLAST, *pos, TEMPSUMMON_TIMED_DESPAWN, 40000))
summon->CastSpell(summon, SPELL_ICY_BLAST_AREA, true);
}

2
src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
View File

@@ -988,7 +988,7 @@ class spell_razorscale_devouring_flame : public SpellScriptLoader
PreventHitDefaultEffect(effIndex);
Unit* caster = GetCaster();
uint32 entry = uint32(GetSpellInfo()->EffectMiscValue[effIndex]);
WorldLocation* summonLocation = GetTargetDest();
WorldLocation const* summonLocation = GetTargetDest();
if (!caster || !summonLocation)
return;

10
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
View File

@@ -988,11 +988,11 @@ public:
Vashj = (Unit::GetCreature((*pPlayer), pInstance->GetData64(DATA_LADYVASHJ)));
if (Vashj && (CAST_AI(boss_lady_vashj::boss_lady_vashjAI, Vashj->AI())->Phase == 2))
{
if (targets.getGOTarget() && targets.getGOTarget()->GetTypeId() == TYPEID_GAMEOBJECT)
if (GameObject* gObj = targets.GetGOTarget())
{
uint32 identifier;
uint8 channel_identifier;
switch(targets.getGOTarget()->GetEntry())
switch(gObj->GetEntry())
{
case 185052:
identifier = DATA_SHIELDGENERATOR1;
@@ -1035,12 +1035,12 @@ public:
pPlayer->DestroyItemCount(31088, 1, true);
return true;
}
else if (targets.getUnitTarget()->GetTypeId() == TYPEID_UNIT)
else if (targets.GetUnitTarget()->GetTypeId() == TYPEID_UNIT)
return false;
else if (targets.getUnitTarget()->GetTypeId() == TYPEID_PLAYER)
else if (targets.GetUnitTarget()->GetTypeId() == TYPEID_PLAYER)
{
pPlayer->DestroyItemCount(31088, 1, true);
pPlayer->CastSpell(targets.getUnitTarget(), 38134, true);
pPlayer->CastSpell(targets.GetUnitTarget(), 38134, true);
return true;
}
}