Merge git://github.com/EQEmu/Server into Development

Conflicts:
	changelog.txt
This commit is contained in:
KayenEQ
2014-09-24 20:51:20 -04:00
39 changed files with 12731 additions and 12430 deletions
+1 -1
View File
@@ -526,7 +526,7 @@ public:
//More stuff to sort:
virtual bool IsRaidTarget() { return false; };
virtual bool IsRaidTarget() const { return false; };
virtual bool IsAttackAllowed(Mob *target, bool isSpellAttack = false);
bool IsTargeted() const { return (targeted > 0); }
inline void IsTargeted(int in_tar) { targeted += in_tar; if(targeted < 0) targeted = 0;}