Merge branch 'master' into feature/eqemu-api-data-service-netstats-ws

This commit is contained in:
Akkadius
2019-07-01 00:52:34 -05:00
16 changed files with 284 additions and 264 deletions
+9
View File
@@ -11,6 +11,10 @@
#include "aa_ability.h"
#include "event_codes.h"
#ifdef BOTS
#include "bot_database.h"
#endif
class Client;
class Corpse;
class Merc;
@@ -549,6 +553,11 @@ public:
/* Things which really dont belong here... */
int16 CommandRequirement(const char* commandname);
#ifdef BOTS
// bot database add-on to eliminate the need for a second database connection
BotDatabase botdb;
#endif
protected:
void ZDBInitVars();