diff --git a/common/debug.cpp b/common/debug.cpp index 1150db9f0..874de6aa6 100644 --- a/common/debug.cpp +++ b/common/debug.cpp @@ -41,14 +41,13 @@ namespace ConsoleColor { #endif +#include "eqemu_logsys.h" #include "debug.h" #include "misc_functions.h" #include "platform.h" #include "eqemu_logsys.h" #include "string_util.h" -EQEmuLogSys backport_log_sys; - #ifndef va_copy #define va_copy(d,s) ((d) = (s)) #endif @@ -165,7 +164,7 @@ bool EQEmuLog::write(LogIDs id, const char *fmt, ...) va_list argptr, tmpargptr; va_start(argptr, fmt); - backport_log_sys.Log(id, vStringFormat(fmt, argptr).c_str()); + logger.Log(id, vStringFormat(fmt, argptr).c_str()); if (logCallbackFmt[id]) { msgCallbackFmt p = logCallbackFmt[id]; diff --git a/common/eqemu_logsys.cpp b/common/eqemu_logsys.cpp index f7bd6edc3..c7e8d300f 100644 --- a/common/eqemu_logsys.cpp +++ b/common/eqemu_logsys.cpp @@ -96,6 +96,7 @@ static Console::Color LogColors[EQEmuLogSys::MaxLogID] = { EQEmuLogSys::EQEmuLogSys(){ + std::cout << "I AM CONSTRUCTING!!!! LUL " << std::endl; } EQEmuLogSys::~EQEmuLogSys(){ diff --git a/common/eqemu_logsys.h b/common/eqemu_logsys.h index 88fd1362f..746689920 100644 --- a/common/eqemu_logsys.h +++ b/common/eqemu_logsys.h @@ -55,7 +55,6 @@ public: void SetCurrentTimeStamp(char* time_stamp); void StartZoneLogs(const std::string log_name); - private: bool zone_general_init = false; diff --git a/world/net.cpp b/world/net.cpp index 11de88892..c75dbe04b 100644 --- a/world/net.cpp +++ b/world/net.cpp @@ -97,14 +97,13 @@ LoginServerList loginserverlist; EQWHTTPServer http_server; UCSConnection UCSLink; QueryServConnection QSLink; -LauncherList launcher_list; +LauncherList launcher_list; AdventureManager adventure_manager; EQEmu::Random emu_random; volatile bool RunLoops = true; uint32 numclients = 0; uint32 numzones = 0; bool holdzones = false; -EQEmuLogSys logger; extern ConsoleList console_list;