[11850] Add SELECT_FLAG_NOT_IN_MELEE_RANGE to SelectAttackingTarget

[ZPS]

Add one more select flag to SelectAttackingTarget. SELECT_FLAG_NOT_IN_MELEE_RANGE - is used when you want to select ranged targets (which are not in melee range).

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp

index 8929bf8..4c09923 100644

--- a/src/game/Creature.cpp

+++ b/src/game/Creature.cpp

@@ -2078,6 +2078,9 @@ bool Creature::MeetsSelectAttackingRequirement(Unit* pTarget, SpellEntry const*

if (selectFlags & SELECT_FLAG_IN_MELEE_RANGE && !CanReachWithMeleeAttack(pTarget))

return false;

+ if (selectFlags & SELECT_FLAG_NOT_IN_MELEE_RANGE && CanReachWithMeleeAttack(pTarget))

+ return false;

+

if (selectFlags & SELECT_FLAG_IN_LOS && !IsWithinLOSInMap(pTarget))

return false;

diff --git a/src/game/Creature.h b/src/game/Creature.h

index 96a4a65..38ecf84 100644

--- a/src/game/Creature.h

+++ b/src/game/Creature.h

@@ -316,13 +316,14 @@ enum AttackingTarget

enum SelectFlags

{

- SELECT_FLAG_IN_LOS = 0x001, // Default Selection Requirement for Spell-targets

- SELECT_FLAG_PLAYER = 0x002,

- SELECT_FLAG_POWER_MANA = 0x004, // For Energy based spells, like manaburn

- SELECT_FLAG_POWER_RAGE = 0x008,

- SELECT_FLAG_POWER_ENERGY = 0x010,

- SELECT_FLAG_POWER_RUNIC = 0x020,

- SELECT_FLAG_IN_MELEE_RANGE = 0x040,

+ SELECT_FLAG_IN_LOS = 0x001, // Default Selection Requirement for Spell-targets

+ SELECT_FLAG_PLAYER = 0x002,

+ SELECT_FLAG_POWER_MANA = 0x004, // For Energy based spells, like manaburn

+ SELECT_FLAG_POWER_RAGE = 0x008,

+ SELECT_FLAG_POWER_ENERGY = 0x010,

+ SELECT_FLAG_POWER_RUNIC = 0x020,

+ SELECT_FLAG_IN_MELEE_RANGE = 0x040,

+ SELECT_FLAG_NOT_IN_MELEE_RANGE = 0x080,

};

// Vendors

P.S.: Btw, tag "[ code ]" is awful...

[sart13]

who !(SELECT_FLAG_IN_MELEE_RANGE) does not fit?

[ZPS]

How are you going to use ! (not)?

Example:

SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL, !(SELECT_FLAG_NOT_IN_MELEE_RANGE));

May be I don't understand something, but I think that code, which handle SELECT_FLAG_NOT_IN_MELEE_RANGE -

if (selectFlags & SELECT_FLAG_IN_MELEE_RANGE && !CanReachWithMeleeAttack(pTarget))

return false;

will have no sense.

[sart13]

see on immune masks for example (this be (all current flags summary) |~SELECT_FLAG_IN_MELEE_RANGE)

[Schmoozerd]

nope - zps solution is correct

~SELECT_FLAG_IN_MELEE is something different than SELECT_FLAG_NOT_IN_MELEE

[michalpolko]

~SELECT_FLAG_IN_MELEE would mean all other bits - masks...

[Schmoozerd]

In 11850. THank you

[sart13]

nope - zps solution is correct

~SELECT_FLAG_IN_MELEE is something different than SELECT_FLAG_NOT_IN_MELEE

in this case need another definition.

PS probably GoogleTranslate gives a very bad translation:) When I wrote about "at least 1 commit per week," not what I mean:)

[Schmoozerd]

well - this one was pretty clear that would be added fast - zps researched a strong case where he needed it - and the code is very clear.

It is just annoying to have simple and reasonable patches waiting for a long time.

[ZPS]

irc rullz.

[sart13]

It is just annoying to have simple and reasonable patches waiting for a long time.

I did not annoying. It has long been accustomed to.