diff options
author | Shauren <shauren.trinity@gmail.com> | 2015-07-21 00:33:36 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2015-07-21 00:33:36 +0200 |
commit | a22e4e121a1e54b2f4154d59623ee4a94a449176 (patch) | |
tree | d4fb01e9f32e3f146062f47638cb1e664568c0de /src/server/game/Spells/SpellScript.cpp | |
parent | 5987391073b0a7a257658ecef51f1df4f0f38842 (diff) |
Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler
Diffstat (limited to 'src/server/game/Spells/SpellScript.cpp')
-rw-r--r-- | src/server/game/Spells/SpellScript.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index 62aa5a52279..12fed61b9e9 100644 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -85,9 +85,9 @@ uint32 _SpellScript::EffectHook::GetAffectedEffectsMask(SpellInfo const* spellEn return mask; } -bool _SpellScript::EffectHook::IsEffectAffected(SpellInfo const* spellEntry, uint8 effIndex) +bool _SpellScript::EffectHook::IsEffectAffected(SpellInfo const* spellEntry, uint8 effIndexToCheck) { - return (GetAffectedEffectsMask(spellEntry) & 1 << effIndex) != 0; + return (GetAffectedEffectsMask(spellEntry) & 1 << effIndexToCheck) != 0; } std::string _SpellScript::EffectHook::EffIndexToString() @@ -189,14 +189,14 @@ std::string SpellScript::EffectHandler::ToString() return "Index: " + EffIndexToString() + " Name: " +_SpellScript::EffectNameCheck::ToString(); } -bool SpellScript::EffectHandler::CheckEffect(SpellInfo const* spellEntry, uint8 effIndex) +bool SpellScript::EffectHandler::CheckEffect(SpellInfo const* spellEntry, uint8 effIndexToCheck) { - return _SpellScript::EffectNameCheck::Check(spellEntry, effIndex); + return _SpellScript::EffectNameCheck::Check(spellEntry, effIndexToCheck); } -void SpellScript::EffectHandler::Call(SpellScript* spellScript, SpellEffIndex effIndex) +void SpellScript::EffectHandler::Call(SpellScript* spellScript, SpellEffIndex effIndexToHandle) { - (spellScript->*pEffectHandlerScript)(effIndex); + (spellScript->*pEffectHandlerScript)(effIndexToHandle); } SpellScript::HitHandler::HitHandler(SpellHitFnType _pHitHandlerScript) @@ -219,12 +219,12 @@ std::string SpellScript::TargetHook::ToString() return oss.str(); } -bool SpellScript::TargetHook::CheckEffect(SpellInfo const* spellEntry, uint8 effIndex) +bool SpellScript::TargetHook::CheckEffect(SpellInfo const* spellEntry, uint8 effIndexToCheck) { if (!targetType) return false; - SpellEffectInfo const* effect = spellEntry->GetEffect(effIndex); + SpellEffectInfo const* effect = spellEntry->GetEffect(effIndexToCheck); if (!effect) return false; @@ -781,9 +781,9 @@ void AuraScript::AuraDispelHandler::Call(AuraScript* auraScript, DispelInfo* _di AuraScript::EffectBase::EffectBase(uint8 _effIndex, uint16 _effName) : _SpellScript::EffectAuraNameCheck(_effName), _SpellScript::EffectHook(_effIndex) { } -bool AuraScript::EffectBase::CheckEffect(SpellInfo const* spellEntry, uint8 effIndex) +bool AuraScript::EffectBase::CheckEffect(SpellInfo const* spellEntry, uint8 effIndexToCheck) { - return _SpellScript::EffectAuraNameCheck::Check(spellEntry, effIndex); + return _SpellScript::EffectAuraNameCheck::Check(spellEntry, effIndexToCheck); } std::string AuraScript::EffectBase::ToString() |