mirror of
https://github.com/mangosfour/server.git
synced 2025-12-12 19:37:03 +00:00
[11850] Add additional flag SELECT_FLAG_NOT_IN_MELEE_RANGE
this allows to select targets that are not in melee range with SelectAttackingTarget Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
This commit is contained in:
parent
93c419460f
commit
f9a259dc44
3 changed files with 11 additions and 8 deletions
|
|
@ -2041,6 +2041,8 @@ bool Creature::MeetsSelectAttackingRequirement(Unit* pTarget, SpellEntry const*
|
||||||
|
|
||||||
if (selectFlags & SELECT_FLAG_IN_MELEE_RANGE && !CanReachWithMeleeAttack(pTarget))
|
if (selectFlags & SELECT_FLAG_IN_MELEE_RANGE && !CanReachWithMeleeAttack(pTarget))
|
||||||
return false;
|
return false;
|
||||||
|
if (selectFlags & SELECT_FLAG_NOT_IN_MELEE_RANGE && CanReachWithMeleeAttack(pTarget))
|
||||||
|
return false;
|
||||||
|
|
||||||
if (selectFlags & SELECT_FLAG_IN_LOS && !IsWithinLOSInMap(pTarget))
|
if (selectFlags & SELECT_FLAG_IN_LOS && !IsWithinLOSInMap(pTarget))
|
||||||
return false;
|
return false;
|
||||||
|
|
|
||||||
|
|
@ -298,13 +298,14 @@ enum AttackingTarget
|
||||||
|
|
||||||
enum SelectFlags
|
enum SelectFlags
|
||||||
{
|
{
|
||||||
SELECT_FLAG_IN_LOS = 0x001, // Default Selection Requirement for Spell-targets
|
SELECT_FLAG_IN_LOS = 0x001, // Default Selection Requirement for Spell-targets
|
||||||
SELECT_FLAG_PLAYER = 0x002,
|
SELECT_FLAG_PLAYER = 0x002,
|
||||||
SELECT_FLAG_POWER_MANA = 0x004, // For Energy based spells, like manaburn
|
SELECT_FLAG_POWER_MANA = 0x004, // For Energy based spells, like manaburn
|
||||||
SELECT_FLAG_POWER_RAGE = 0x008,
|
SELECT_FLAG_POWER_RAGE = 0x008,
|
||||||
SELECT_FLAG_POWER_ENERGY = 0x010,
|
SELECT_FLAG_POWER_ENERGY = 0x010,
|
||||||
SELECT_FLAG_POWER_RUNIC = 0x020,
|
SELECT_FLAG_POWER_RUNIC = 0x020,
|
||||||
SELECT_FLAG_IN_MELEE_RANGE = 0x040,
|
SELECT_FLAG_IN_MELEE_RANGE = 0x040,
|
||||||
|
SELECT_FLAG_NOT_IN_MELEE_RANGE = 0x080,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Vendors
|
// Vendors
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "11849"
|
#define REVISION_NR "11850"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue