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

Merge branch 'master' into feature/global-base-scaling

Browse Source
This commit is contained in:
Akkadius
2018-12-16 22:48:55 -06:00
parent a9fc1d89c8 bfe85a2f1b
commit e835514fca
7 changed files with 52 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client.h
+5 -1
View File
@@ -703,7 +703,9 @@ public:
void SendGuildJoin(GuildJoin_Struct* gj);
void RefreshGuildInfo();
int GetClientMaxLevel() const { return client_max_level; }
void SetClientMaxLevel(int max_level) { client_max_level = max_level; }
void CheckManaEndUpdate();
void SendManaUpdate();
void SendEnduranceUpdate();
@@ -1652,6 +1654,8 @@ private:
void InterrogateInventory_(bool errorcheck, Client* requester, int16 head, int16 index, const EQEmu::ItemInstance* inst, const EQEmu::ItemInstance* parent, bool log, bool silent, bool &error, int depth);
bool InterrogateInventory_error(int16 head, int16 index, const EQEmu::ItemInstance* inst, const EQEmu::ItemInstance* parent, int depth);
int client_max_level;
#ifdef BOTS
struct BotOwnerOptions {
bool death_marquee;