pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-18 19:41:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix double construction of EQEmuLogSys

Browse Source
This commit is contained in:
Akkadius 2015-01-11 22:41:44 -06:00
parent 855f7ac2a0
commit 3c53d907da
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/debug.cpp
View File

@ -41,14 +41,13 @@ namespace ConsoleColor {
#endif #endif
#include "eqemu_logsys.h"
#include "debug.h" #include "debug.h"
#include "misc_functions.h" #include "misc_functions.h"
#include "platform.h" #include "platform.h"
#include "eqemu_logsys.h" #include "eqemu_logsys.h"
#include "string_util.h" #include "string_util.h"
EQEmuLogSys backport_log_sys;
#ifndef va_copy #ifndef va_copy
#define va_copy(d,s) ((d) = (s)) #define va_copy(d,s) ((d) = (s))
#endif #endif
@ -165,7 +164,7 @@ bool EQEmuLog::write(LogIDs id, const char *fmt, ...)
va_list argptr, tmpargptr; va_list argptr, tmpargptr;
va_start(argptr, fmt); 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]) { if (logCallbackFmt[id]) {
msgCallbackFmt p = logCallbackFmt[id]; msgCallbackFmt p = logCallbackFmt[id];

1
common/eqemu_logsys.cpp
View File

@ -96,6 +96,7 @@ static Console::Color LogColors[EQEmuLogSys::MaxLogID] = {
EQEmuLogSys::EQEmuLogSys(){ EQEmuLogSys::EQEmuLogSys(){
std::cout << "I AM CONSTRUCTING!!!! LUL " << std::endl;
} }
EQEmuLogSys::~EQEmuLogSys(){ EQEmuLogSys::~EQEmuLogSys(){

1
common/eqemu_logsys.h
View File

@ -55,7 +55,6 @@ public:
void SetCurrentTimeStamp(char* time_stamp); void SetCurrentTimeStamp(char* time_stamp);
void StartZoneLogs(const std::string log_name); void StartZoneLogs(const std::string log_name);
private: private:
bool zone_general_init = false; bool zone_general_init = false;

3
world/net.cpp
View File

@ -97,14 +97,13 @@ LoginServerList loginserverlist;
EQWHTTPServer http_server; EQWHTTPServer http_server;
UCSConnection UCSLink; UCSConnection UCSLink;
QueryServConnection QSLink; QueryServConnection QSLink;
LauncherList launcher_list; LauncherList launcher_list;
AdventureManager adventure_manager; AdventureManager adventure_manager;
EQEmu::Random emu_random; EQEmu::Random emu_random;
volatile bool RunLoops = true; volatile bool RunLoops = true;
uint32 numclients = 0; uint32 numclients = 0;
uint32 numzones = 0; uint32 numzones = 0;
bool holdzones = false; bool holdzones = false;
EQEmuLogSys logger;
extern ConsoleList console_list; extern ConsoleList console_list;