From 57ac6c0e98dd55a6174fe72558c97d909f0c73aa Mon Sep 17 00:00:00 2001 From: Akkadius Date: Sun, 18 Jan 2015 01:39:01 -0600 Subject: [PATCH] Remove EQEmuLogSys::Log from consolidation of types into categories --- common/debug.cpp | 2 +- common/eqemu_logsys.cpp | 16 ---------------- common/eqemu_logsys.h | 11 ----------- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/common/debug.cpp b/common/debug.cpp index 9b15bcbd9..7dbd28751 100644 --- a/common/debug.cpp +++ b/common/debug.cpp @@ -158,7 +158,7 @@ bool EQEmuLog::write(LogIDs id, const char *fmt, ...) va_list argptr, tmpargptr; va_start(argptr, fmt); - Log.Log(id, vStringFormat(fmt, argptr).c_str()); + // Log.Log(id, vStringFormat(fmt, argptr).c_str()); return true; } diff --git a/common/eqemu_logsys.cpp b/common/eqemu_logsys.cpp index d8c73adca..faa05083b 100644 --- a/common/eqemu_logsys.cpp +++ b/common/eqemu_logsys.cpp @@ -190,22 +190,6 @@ void EQEmuLogSys::DebugCategory(DebugLevel debug_level, uint16 log_category, std EQEmuLogSys::ProcessLogWrite(EQEmuLogSys::Debug, log_category, output_debug_message); } -void EQEmuLogSys::Log(uint16 log_type, const std::string message, ...) -{ - if (log_type > EQEmuLogSys::MaxLogID){ - return; - } - - va_list args; - va_start(args, message); - std::string output_message = vStringFormat(message.c_str(), args); - va_end(args); - - EQEmuLogSys::ProcessConsoleMessage(log_type, 0, output_message); - EQEmuLogSys::ProcessGMSay(log_type, 0, output_message); - EQEmuLogSys::ProcessLogWrite(log_type, 0, output_message); -} - void EQEmuLogSys::SetCurrentTimeStamp(char* time_stamp){ time_t raw_time; struct tm * time_info; diff --git a/common/eqemu_logsys.h b/common/eqemu_logsys.h index 4a4a26f7a..de49967db 100644 --- a/common/eqemu_logsys.h +++ b/common/eqemu_logsys.h @@ -31,17 +31,6 @@ public: EQEmuLogSys(); ~EQEmuLogSys(); - enum LogType { - Status = 0, /* This must stay the first entry in this list */ - Normal, /* Normal Logs */ - Error, /* Error Logs */ - Debug, /* Debug Logs */ - Quest, /* Quest Logs */ - Commands, /* Issued Commands */ - Crash, /* Crash Logs */ - MaxLogID /* Max, used in functions to get the max log ID */ - }; - enum DebugLevel { General = 0, /* 0 - Low-Level general debugging, useful info on single line */ Moderate, /* 1 - Informational based, used in functions, when particular things load */