mirror of
https://github.com/EQEmu/Server.git
synced 2026-09-04 18:46:37 +00:00
Fixed Merc duplicate save bug, focus items, spell_scale and heal_scale now work implemented, new merc equipment (with focus items), added checks during merc hire, unsuspend, & timer update for states where a merc can't be hired, unsuspended, or can't be retained due to insufficient funds, no room in group, in raid, invalid merc data, etc, and give appropriate feedback, added rules for charging of merc purchase and upkeep costs.
This commit is contained in:
@@ -219,6 +219,7 @@ public:
|
||||
bool CanDoCombat() const { return(can_combat); }
|
||||
bool CanLevitate() const {return(can_levitate); } // Magoth78
|
||||
bool CanCastOutdoor() const {return(can_castoutdoor);} //qadar
|
||||
bool AllowMercs() const {return(allow_mercs);}
|
||||
bool IsHotzone() const { return(is_hotzone); }
|
||||
inline bool BuffTimersSuspended() const { return newzone_data.SuspendBuffs != 0; };
|
||||
|
||||
@@ -269,6 +270,7 @@ private:
|
||||
bool can_castoutdoor;
|
||||
bool can_levitate;
|
||||
bool is_hotzone;
|
||||
bool allow_mercs;
|
||||
uint32 pgraveyard_id, pgraveyard_zoneid;
|
||||
float pgraveyard_x, pgraveyard_y, pgraveyard_z, pgraveyard_heading;
|
||||
int default_ruleset;
|
||||
|
||||
Reference in New Issue
Block a user