merge upstream

2026-05-16 22:58:34 +00:00 · 2014-12-21 13:45:26 -08:00
parent f0e22c9ff9 f588c54d52
commit f409d39f1a
193 changed files with 4491 additions and 9483 deletions
@@ -19,12 +19,17 @@
 #include "../common/debug.h"
 #include "../common/rulesys.h"
 #include "../common/string_util.h"
+
 #include "queryserv.h"
 #include "quest_parser_collection.h"
 #include "string_ids.h"
 #include "worldserver.h"
 #include "zone.h"

+#ifdef BOTS
+#include "bot.h"
+#endif
+
 extern QueryServ* QServ;
 extern WorldServer worldserver;
 extern Zone* zone;