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

Fix GCC build.

Browse Source
This commit is contained in:
QAston
2011-08-20 09:32:19 +02:00
parent 03f3a2a636
commit cf4e19cf4b
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/Spells/Spell.cpp
View File

@@ -451,7 +451,8 @@ SpellValue::SpellValue(SpellInfo const* proto)
Spell::Spell(Unit* caster, SpellInfo const *info, TriggerCastFlags triggerFlags, uint64 originalCasterGUID, bool skipCheck) :
m_spellInfo(sSpellMgr->GetSpellForDifficultyFromSpell(info, caster)),
m_caster(caster), m_spellValue(new SpellValue(m_spellInfo))
m_caster((info->AttributesEx6 & SPELL_ATTR6_CAST_BY_CHARMER && caster->GetCharmerOrOwner()) ? caster->GetCharmerOrOwner() : caster)
, m_spellValue(new SpellValue(m_spellInfo))
{
m_customError = SPELL_CUSTOM_ERROR_NONE;
m_skipCheck = skipCheck;
@@ -496,9 +497,6 @@ m_caster(caster), m_spellValue(new SpellValue(m_spellInfo))
if (Item* pItem = m_caster->ToPlayer()->GetWeaponForAttack(RANGED_ATTACK))
m_spellSchoolMask = SpellSchoolMask(1 << pItem->GetTemplate()->Damage[0].DamageType);
if (info->AttributesEx6 & SPELL_ATTR6_CAST_BY_CHARMER)
const_cast<Unit*>(m_caster) = caster->GetCharmerOrOwner();
if (originalCasterGUID)
m_originalCasterGUID = originalCasterGUID;
else