diff options
| author | click <none@none> | 2010-10-07 14:00:52 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-10-07 14:00:52 +0200 |
| commit | a67d7c9afdd0b2144cee24d318917dfd57eff1d8 (patch) | |
| tree | 6a67af36708107bccca3ef757e18d3c81052788c /src/server/game/Spells | |
| parent | df66aee929094359aecfed6aeb256bfefd7025ab (diff) | |
Copyright header updates - part 3... (and some whitespace cleanups)
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Spells')
| -rwxr-xr-x | src/server/game/Spells/SpellEffects.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Spells/SpellScript.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 51807eddef6..dd4ad747bd1 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -3421,7 +3421,7 @@ void Spell::EffectEnchantItemPerm(SpellEffIndex effIndex) SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id); if (!pEnchant) return; - + // item can be in trade slot and have owner diff. from caster Player* item_owner = itemTarget->GetOwner(); if (!item_owner) diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index e533e2b6e1e..7ec6adf83db 100755 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -536,7 +536,7 @@ void AuraScript::_PrepareScriptCall(AuraScriptHookType hookType) case AURA_SCRIPT_HOOK_EFFECT_APPLY: case AURA_SCRIPT_HOOK_EFFECT_REMOVE: case AURA_SCRIPT_HOOK_EFFECT_PERIODIC: - m_defaultActionPrevented = false; + m_defaultActionPrevented = false; break; default: break; @@ -561,7 +561,7 @@ bool AuraScript::_IsDefaultActionPrevented() } } -void AuraScript::PreventDefaultAction() +void AuraScript::PreventDefaultAction() { switch (m_currentScriptState) { |
