mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 19:37:02 +00:00
- Included the fix for g3d to make it compile on FreeBSD
- Pulled in a patch from cmangos that fixed the spells being broken
This commit is contained in:
parent
c410f30f65
commit
0759658736
3 changed files with 15 additions and 10 deletions
|
|
@ -27,6 +27,14 @@
|
|||
# include <io.h>
|
||||
|
||||
#define stat64 _stat64
|
||||
#elif defined(__FreeBSD__)
|
||||
# include <dirent.h>
|
||||
# include <fnmatch.h>
|
||||
# include <unistd.h>
|
||||
# define O_LARGEFILE 0100000
|
||||
# define stat64 stat
|
||||
# define _stat stat
|
||||
# define _getcwd getcwd
|
||||
#else
|
||||
# include <dirent.h>
|
||||
# include <fnmatch.h>
|
||||
|
|
|
|||
|
|
@ -1895,12 +1895,11 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
|
|||
{
|
||||
if (Unit* pUnitTarget = m_caster->SelectMagnetTarget(m_targets.getUnitTarget(), this, effIndex))
|
||||
{
|
||||
if (m_targets.getUnitTarget() != pUnitTarget)
|
||||
{
|
||||
m_targets.setUnitTarget(pUnitTarget);
|
||||
if (m_targets.getUnitTarget() && m_targets.getUnitTarget() != pUnitTarget)
|
||||
m_spellFlags |= SPELL_FLAG_REDIRECTED;
|
||||
targetUnitMap.push_back(pUnitTarget);
|
||||
}
|
||||
|
||||
m_targets.setUnitTarget(pUnitTarget);
|
||||
targetUnitMap.push_back(pUnitTarget);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -2462,11 +2461,9 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
|
|||
{
|
||||
if (Unit* pUnitTarget = m_caster->SelectMagnetTarget(m_targets.getUnitTarget(), this, effIndex))
|
||||
{
|
||||
if (m_targets.getUnitTarget() != pUnitTarget)
|
||||
{
|
||||
m_targets.setUnitTarget(pUnitTarget);
|
||||
if (m_targets.getUnitTarget() && m_targets.getUnitTarget() != pUnitTarget)
|
||||
m_spellFlags |= SPELL_FLAG_REDIRECTED;
|
||||
}
|
||||
|
||||
targetUnitMap.push_back(pUnitTarget);
|
||||
}
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#ifndef __REVISION_NR_H__
|
||||
#define __REVISION_NR_H__
|
||||
#define REVISION_NR "12651"
|
||||
#define REVISION_NR "12652"
|
||||
#endif // __REVISION_NR_H__
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue