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

Merge upstream/master to incorporate EQEmu fixes

Browse Source 
Resolve CMake style conflict in common/CMakeLists.txt by adopting
the lowercase CMake command style used consistently throughout
the upstream codebase.
This commit is contained in:
Claude
2026-01-24 05:02:16 +00:00
parent 54d54f79ca 9d2cc213ce
commit 385b9922aa
1869 changed files with 10045 additions and 67384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/main.cpp
+43 -57
View File
@@ -18,63 +18,57 @@
*
*/
#define DONT_SHARED_OPCODES
#define PLATFORM_ZONE 1
#include "common/crash.h"
#include "common/database/database_update.h"
#include "common/eq_packet_structs.h"
#include "common/eq_stream_ident.h"
#include "common/eqemu_logsys.h"
#include "common/events/player_event_logs.h"
#include "common/evolving_items.h"
#include "common/file.h"
#include "common/guilds.h"
#include "common/memory_mapped_file.h"
#include "common/misc.h"
#include "common/mutex.h"
#include "common/net/eqstream.h"
#include "common/opcodemgr.h"
#include "common/patches/patches.h"
#include "common/path_manager.h"
#include "common/platform/posix/include_pthreads.h"
#include "common/profanity_manager.h"
#include "common/rulesys.h"
#include "common/skill_caps.h"
#include "common/spdat.h"
#include "common/strings.h"
#include "common/timer.h"
#include "zone/api_service.h"
#include "zone/bot_command.h"
#include "zone/command.h"
#include "zone/embparser.h"
#include "zone/guild_mgr.h"
#include "zone/lua_parser.h"
#include "zone/masterentity.h"
#include "zone/npc_scale_manager.h"
#include "zone/queryserv.h"
#include "zone/quest_parser_collection.h"
#include "zone/questmgr.h"
#include "zone/task_manager.h"
#include "zone/titles.h"
#include "zone/worldserver.h"
#include "zone/zone_cli.h"
#include "zone/zone_config.h"
#include "zone/zone_event_scheduler.h"
#include "zone/zone.h"
#include "zone/zonedb.h"
#include "../common/global_define.h"
#include "../common/timer.h"
#include "../common/eq_packet_structs.h"
#include "../common/mutex.h"
#include "../common/opcodemgr.h"
#include "../common/guilds.h"
#include "../common/eq_stream_ident.h"
#include "../common/patches/patches.h"
#include "../common/rulesys.h"
#include "../common/profanity_manager.h"
#include "../common/strings.h"
#include "../common/crash.h"
#include "../common/memory_mapped_file.h"
#include "../common/spdat.h"
#include "../common/eqemu_logsys.h"
#include "../common/misc.h"
#include "api_service.h"
#include "zone_config.h"
#include "masterentity.h"
#include "worldserver.h"
#include "zone.h"
#include "queryserv.h"
#include "command.h"
#include "bot_command.h"
#include "zonedb.h"
#include "titles.h"
#include "guild_mgr.h"
#include "task_manager.h"
#include "quest_parser_collection.h"
#include "embparser.h"
#include "../common/evolving_items.h"
#include "lua_parser.h"
#include "questmgr.h"
#include "npc_scale_manager.h"
#include "../common/net/eqstream.h"
#include <signal.h>
#include <chrono>
#include <csignal>
#ifdef _CRTDBG_MAP_ALLOC
#undef new
#define new new(_NORMAL_BLOCK, __FILE__, __LINE__)
#endif
#ifdef _WINDOWS
#else
#include <pthread.h>
#include "../common/unix.h"
#endif
volatile bool RunLoops = true;
#ifdef __FreeBSD__
#include <pthread_np.h>
@@ -82,14 +76,6 @@ volatile bool RunLoops = true;
extern volatile bool is_zone_loaded;
#include "zone_event_scheduler.h"
#include "../common/file.h"
#include "../common/events/player_event_logs.h"
#include "../common/path_manager.h"
#include "../common/database/database_update.h"
#include "../common/skill_caps.h"
#include "zone_cli.h"
EntityList entity_list;
WorldServer worldserver;
uint32 numclients = 0;