mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9182] Replace 0 with NULL in a few CastSpell calls (removed where not needed)

Browse source 
Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
NoFantasy 2010-01-15 01:42:31 +01:00
parent 0d6b7f144c
commit dbf0fafbfe
6 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/CharacterHandler.cpp
View file

@ -732,8 +732,8 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder *holder)
{ {
// not blizz like, we must correctly save and load player instead... // not blizz like, we must correctly save and load player instead...
if(pCurrChar->getRace() == RACE_NIGHTELF) if(pCurrChar->getRace() == RACE_NIGHTELF)
pCurrChar->CastSpell(pCurrChar, 20584, true, 0);// auras SPELL_AURA_INCREASE_SPEED(+speed in wisp form), SPELL_AURA_INCREASE_SWIM_SPEED(+swim speed in wisp form), SPELL_AURA_TRANSFORM (to wisp form) pCurrChar->CastSpell(pCurrChar, 20584, true); // auras SPELL_AURA_INCREASE_SPEED(+speed in wisp form), SPELL_AURA_INCREASE_SWIM_SPEED(+swim speed in wisp form), SPELL_AURA_TRANSFORM (to wisp form)
pCurrChar->CastSpell(pCurrChar, 8326, true, 0); // auras SPELL_AURA_GHOST, SPELL_AURA_INCREASE_SPEED(why?), SPELL_AURA_INCREASE_SWIM_SPEED(why?) pCurrChar->CastSpell(pCurrChar, 8326, true); // auras SPELL_AURA_GHOST, SPELL_AURA_INCREASE_SPEED(why?), SPELL_AURA_INCREASE_SWIM_SPEED(why?)
pCurrChar->SetMovement(MOVE_WATER_WALK); pCurrChar->SetMovement(MOVE_WATER_WALK);
} }

4
src/game/GameObject.cpp
View file

@ -339,7 +339,7 @@ void GameObject::Update(uint32 /*p_time*/)
{ {
Unit *caster = owner ? owner : ok; Unit *caster = owner ? owner : ok;
caster->CastSpell(ok, goInfo->trap.spellId, true, 0, 0, GetGUID()); caster->CastSpell(ok, goInfo->trap.spellId, true, NULL, NULL, GetGUID());
m_cooldownTime = time(NULL) + 4; // 4 seconds m_cooldownTime = time(NULL) + 4; // 4 seconds
// count charges // count charges
@ -804,7 +804,7 @@ void GameObject::TriggeringLinkedGameObject( uint32 trapEntry, Unit* target)
// found correct GO // found correct GO
// FIXME: when GO casting will be implemented trap must cast spell to target // FIXME: when GO casting will be implemented trap must cast spell to target
if(trapGO) if(trapGO)
target->CastSpell(target,trapSpell,true, 0, 0, GetGUID()); target->CastSpell(target, trapSpell, true, NULL, NULL, GetGUID());
} }
GameObject* GameObject::LookupFishingHoleAround(float range) GameObject* GameObject::LookupFishingHoleAround(float range)

8
src/game/SpellAuras.cpp
View file

@ -1540,7 +1540,7 @@ void Aura::TriggerSpell()
// Brood Affliction: Bronze // Brood Affliction: Bronze
case 23170: case 23170:
{ {
m_target->CastSpell(m_target, 23171, true, 0, this); m_target->CastSpell(m_target, 23171, true, NULL, this);
return; return;
} }
// // Mark of Frost // // Mark of Frost
@ -4363,7 +4363,7 @@ void Aura::HandleModMechanicImmunity(bool apply, bool /*Real*/)
if ((*i)->GetSpellProto()->SpellIconID == 2229) if ((*i)->GetSpellProto()->SpellIconID == 2229)
{ {
if (apply) if (apply)
owner->CastSpell(owner, 34471, true, 0, this); owner->CastSpell(owner, 34471, true, NULL, this);
else else
owner->RemoveAurasDueToSpell(34471); owner->RemoveAurasDueToSpell(34471);
break; break;
@ -7488,12 +7488,12 @@ void Aura::PeriodicDummyTick()
// Feeding Frenzy Rank 1 // Feeding Frenzy Rank 1
case 53511: case 53511:
if ( m_target->GetHealth() * 100 < m_target->GetMaxHealth() * 35 ) if ( m_target->GetHealth() * 100 < m_target->GetMaxHealth() * 35 )
m_target->CastSpell(m_target, 60096, true, 0, this); m_target->CastSpell(m_target, 60096, true, NULL, this);
return; return;
// Feeding Frenzy Rank 2 // Feeding Frenzy Rank 2
case 53512: case 53512:
if ( m_target->GetHealth() * 100 < m_target->GetMaxHealth() * 35 ) if ( m_target->GetHealth() * 100 < m_target->GetMaxHealth() * 35 )
m_target->CastSpell(m_target, 60097, true, 0, this); m_target->CastSpell(m_target, 60097, true, NULL, this);
return; return;
default: default:
break; break;

10
src/game/SpellEffects.cpp
View file

@ -500,7 +500,7 @@ void Spell::EffectSchoolDMG(uint32 effect_idx)
int chance = (*i)->GetSpellProto()->CalculateSimpleValue(1); int chance = (*i)->GetSpellProto()->CalculateSimpleValue(1);
if (roll_chance_i(chance)) if (roll_chance_i(chance))
// Mind Trauma // Mind Trauma
m_caster->CastSpell(unitTarget, 48301, true, 0); m_caster->CastSpell(unitTarget, 48301, true);
break; break;
} }
} }
@ -1582,9 +1582,9 @@ void Spell::EffectDummy(uint32 i)
return; return;
} }
if (m_caster->IsFriendlyTo(unitTarget)) if (m_caster->IsFriendlyTo(unitTarget))
m_caster->CastSpell(unitTarget, heal, true, 0); m_caster->CastSpell(unitTarget, heal, true);
else else
m_caster->CastSpell(unitTarget, hurt, true, 0); m_caster->CastSpell(unitTarget, hurt, true);
return; return;
} }
break; break;
@ -1800,9 +1800,9 @@ void Spell::EffectDummy(uint32 i)
} }
if (m_caster->IsFriendlyTo(unitTarget)) if (m_caster->IsFriendlyTo(unitTarget))
m_caster->CastSpell(unitTarget, heal, true, 0); m_caster->CastSpell(unitTarget, heal, true);
else else
m_caster->CastSpell(unitTarget, hurt, true, 0); m_caster->CastSpell(unitTarget, hurt, true);
return; return;
} }

2
src/game/SpellHandler.cpp
View file

@ -537,7 +537,7 @@ void WorldSession::HandleSelfResOpcode( WorldPacket & /*recv_data*/ )
{ {
SpellEntry const *spellInfo = sSpellStore.LookupEntry(_player->GetUInt32Value(PLAYER_SELF_RES_SPELL)); SpellEntry const *spellInfo = sSpellStore.LookupEntry(_player->GetUInt32Value(PLAYER_SELF_RES_SPELL));
if(spellInfo) if(spellInfo)
_player->CastSpell(_player,spellInfo,false,0); _player->CastSpell(_player, spellInfo, false);
_player->SetUInt32Value(PLAYER_SELF_RES_SPELL, 0); _player->SetUInt32Value(PLAYER_SELF_RES_SPELL, 0);
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9181" #define REVISION_NR "9182"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__