pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-08-29 00:18:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge master to movement_manager, fix for merge failure

Browse Source
This commit is contained in:
KimLS
2018-10-14 17:23:11 -07:00
parent 1600f68239 9f039b47e9
commit cd6fd2d2dc
75 changed files with 4554 additions and 2031 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client.h
+19
View File
@@ -1614,6 +1614,25 @@ 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);
#ifdef BOTS
struct BotOwnerOptions {
bool death_marquee;
};
BotOwnerOptions bot_owner_options;
const BotOwnerOptions DefaultBotOwnerOptions = {
false // death_marquee
};
public:
void SetBotOptionDeathMarquee(bool flag) { bot_owner_options.death_marquee = flag; }
bool GetBotOptionDeathMarquee() const { return bot_owner_options.death_marquee; }
private:
#endif
};
#endif