Merge pull request #404 from noudess/master

Mobs that were blinded were being included in every use of IsFeared()
This commit is contained in:
Michael Cook (mackal) 2015-05-02 02:59:39 -04:00
commit 1438c1a9c3

View File

@ -803,8 +803,7 @@ public:
//old fear function //old fear function
//void SetFeared(Mob *caster, uint32 duration, bool flee = false); //void SetFeared(Mob *caster, uint32 duration, bool flee = false);
float GetFearSpeed(); float GetFearSpeed();
bool IsFeared() { return curfp; } // This returns true if the mob is feared or fleeing due to low HP bool IsFeared() { return (spellbonuses.IsFeared || flee_mode); } // This returns true if the mob is feared or fleeing due to low HP
//old fear: inline void StartFleeing() { SetFeared(GetHateTop(), FLEE_RUN_DURATION, true); }
inline void StartFleeing() { flee_mode = true; CalculateNewFearpoint(); } inline void StartFleeing() { flee_mode = true; CalculateNewFearpoint(); }
void ProcessFlee(); void ProcessFlee();
void CheckFlee(); void CheckFlee();