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

Mercenaries now Dismiss, Suspend, Unsuspend, and Die correctly.

Browse Source
This commit is contained in:
Trevius
2014-11-19 22:43:19 -06:00
parent 8f32a9949b
commit 6c5248b9a9
5 changed files with 134 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client.h
+3 -1
View File
@@ -1094,12 +1094,13 @@ void SetConsumption(int32 in_hunger, int32 in_thirst);
void RemoveGroupXTargets();
void RemoveAutoXTargets();
void ShowXTargets(Client *c);
void InitializeMercInfo();
bool CheckCanSpawnMerc(uint32 template_id);
bool CheckCanHireMerc(Mob* merchant, uint32 template_id);
bool CheckCanRetainMerc(uint32 upkeep);
bool CheckCanUnsuspendMerc();
bool CheckCanDismissMerc();
bool DismissMerc(uint32 MercID);
inline uint32 GetMercID() const { return mercid; }
inline uint8 GetMercSlot() const { return mercSlot; }
void SetMercID( uint32 newmercid) { mercid = newmercid; }
@@ -1126,6 +1127,7 @@ void SetConsumption(int32 in_hunger, int32 in_thirst);
void UpdateMercLevel();
void CheckMercSuspendTimer();
Timer* GetMercTimer() { return &merc_timer; };
const char* GetRacePlural(Client* client);
const char* GetClassPlural(Client* client);
void SendWebLink(const char* website);