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

Fixed build after merge.

Browse source
This commit is contained in:
VladimirMangos 2008-12-09 08:28:42 +03:00
parent ef69f6b80c
commit 6cee03bae0
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/game/SpellAuras.cpp
View file

@ -1204,14 +1204,14 @@ void Aura::HandleAddModifier(bool apply, bool Real)
uint32 const *ptr;
SpellAffectEntry const *spellAffect = spellmgr.GetSpellAffect(GetId(), m_effIndex);
if (spellAffect)
ptr = spellAffect->SpellClassMask;
ptr = &spellAffect->SpellClassMask[0];
else
{
switch (m_effIndex)
{
case 0: ptr = m_spellProto->EffectSpellClassMaskA; break;
case 1: ptr = m_spellProto->EffectSpellClassMaskB; break;
case 2: ptr = m_spellProto->EffectSpellClassMaskC; break;
case 0: ptr = &m_spellProto->EffectSpellClassMaskA[0]; break;
case 1: ptr = &m_spellProto->EffectSpellClassMaskB[0]; break;
case 2: ptr = &m_spellProto->EffectSpellClassMaskC[0]; break;
default:
return;
}
@ -1254,14 +1254,14 @@ void Aura::HandleAddTargetTrigger(bool apply, bool Real)
uint32 const *ptr;
SpellAffectEntry const *spellAffect = spellmgr.GetSpellAffect(GetId(), m_effIndex);
if (spellAffect)
ptr = spellAffect->SpellClassMask;
ptr = &spellAffect->SpellClassMask[0];
else
{
switch (m_effIndex)
{
case 0: ptr = m_spellProto->EffectSpellClassMaskA; break;
case 1: ptr = m_spellProto->EffectSpellClassMaskB; break;
case 2: ptr = m_spellProto->EffectSpellClassMaskC; break;
case 0: ptr = &m_spellProto->EffectSpellClassMaskA[0]; break;
case 1: ptr = &m_spellProto->EffectSpellClassMaskB[0]; break;
case 2: ptr = &m_spellProto->EffectSpellClassMaskC[0]; break;
default:
return;
}

12
src/game/SpellMgr.cpp
View file

@ -723,9 +723,9 @@ void SpellMgr::LoadSpellAffects()
uint32 const *ptr = 0;
switch (effectId)
{
case 0: ptr = spellInfo->EffectSpellClassMaskA; break;
case 1: ptr = spellInfo->EffectSpellClassMaskB; break;
case 2: ptr = spellInfo->EffectSpellClassMaskC; break;
case 0: ptr = &spellInfo->EffectSpellClassMaskA[0]; break;
case 1: ptr = &spellInfo->EffectSpellClassMaskB[0]; break;
case 2: ptr = &spellInfo->EffectSpellClassMaskC[0]; break;
default:
continue;
}
@ -763,9 +763,9 @@ void SpellMgr::LoadSpellAffects()
uint32 const *ptr = 0;
switch (effectId)
{
case 0: ptr = spellInfo->EffectSpellClassMaskA; break;
case 1: ptr = spellInfo->EffectSpellClassMaskB; break;
case 2: ptr = spellInfo->EffectSpellClassMaskC; break;
case 0: ptr = &spellInfo->EffectSpellClassMaskA[0]; break;
case 1: ptr = &spellInfo->EffectSpellClassMaskB[0]; break;
case 2: ptr = &spellInfo->EffectSpellClassMaskC[0]; break;
default:
continue;
}

2
src/game/Traveller.h
View file

@ -62,7 +62,7 @@ inline float Traveller<Creature>::Speed()
if(i_traveller.HasUnitMovementFlag(MOVEMENTFLAG_WALK_MODE))
return i_traveller.GetSpeed(MOVE_WALK);
else if(i_traveller.HasUnitMovementFlag(MOVEMENTFLAG_FLYING2))
return i_traveller.GetSpeed(MOVE_FLY);
return i_traveller.GetSpeed(MOVE_FLIGHT);
else
return i_traveller.GetSpeed(MOVE_RUN);
}