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

Merge branch 'master' into tob_patch

Browse Source
This commit is contained in:
KimLS
2026-04-20 18:41:45 -07:00
parent 3035e906fe 5dc093fe5e
commit dceec36fad
16 changed files with 323 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client.h
+1
View File
@@ -1773,6 +1773,7 @@ public:
MercInfo& GetMercInfo(uint8 slot) { return m_mercinfo[slot]; }
MercInfo& GetMercInfo() { return m_mercinfo[mercSlot]; }
uint8 GetNumberOfMercenaries();
int GetFirstFreeMercSlot();
void SetMerc(Merc* newmerc);
void SendMercResponsePackets(uint32 ResponseType);
void SendMercMerchantResponsePacket(int32 response_type);