pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-05 23:56:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge fix

Browse Source
This commit is contained in:
KimLS
2018-11-11 01:05:44 -08:00
parent ab6cdd65a3 4e0d85534e
commit ef32940be2
17 changed files with 754 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/mob.h
+6 -3
View File
@@ -679,10 +679,12 @@ public:
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;}
void SetFollowID(uint32 id) { follow = id; }
void SetFollowID(uint32 id) { follow_id = id; }
void SetFollowDistance(uint32 dist) { follow_dist = dist; }
uint32 GetFollowID() const { return follow; }
void SetFollowCanRun(bool v) { follow_run = v; }
uint32 GetFollowID() const { return follow_id; }
uint32 GetFollowDistance() const { return follow_dist; }
bool GetFollowCanRun() const { return follow_run; }
inline bool IsRareSpawn() const { return rare_spawn; }
inline void SetRareSpawn(bool in) { rare_spawn = in; }
@@ -1229,8 +1231,9 @@ protected:
uint16 ownerid;
PetType typeofpet;
int16 petpower;
uint32 follow;
uint32 follow_id;
uint32 follow_dist;
bool follow_run;
bool no_target_hotkey;
bool rare_spawn;