From 0926a5ded390870cdf3fe2ec52f8819c302ff084 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Sun, 18 Jan 2015 01:41:11 -0600 Subject: [PATCH] Refactor ProcessGMSay to no longer use type --- common/eqemu_logsys.cpp | 32 +++++++++++--------------------- common/eqemu_logsys.h | 1 - 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/common/eqemu_logsys.cpp b/common/eqemu_logsys.cpp index faa05083b..0b4b61d8c 100644 --- a/common/eqemu_logsys.cpp +++ b/common/eqemu_logsys.cpp @@ -61,25 +61,15 @@ namespace Console { }; } -static const char* TypeNames[EQEmuLogSys::MaxLogID] = { - "Status", - "Normal", - "Error", - "Debug", - "Quest", - "Command", - "Crash", -}; - -static Console::Color LogColors[EQEmuLogSys::MaxLogID] = { - Console::Color::Yellow, // "Status", - Console::Color::Yellow, // "Normal", - Console::Color::LightRed, // "Error", - Console::Color::LightGreen, // "Debug", - Console::Color::LightCyan, // "Quest", - Console::Color::LightMagenta, // "Command", - Console::Color::LightRed // "Crash" -}; +// static Console::Color LogColors[MaxCategoryID] = { +// Console::Color::Yellow, // "Status", +// Console::Color::Yellow, // "Normal", +// Console::Color::LightRed, // "Error", +// Console::Color::LightGreen, // "Debug", +// Console::Color::LightCyan, // "Quest", +// Console::Color::LightMagenta, // "Command", +// Console::Color::LightRed // "Crash" +// }; EQEmuLogSys::EQEmuLogSys(){ @@ -109,7 +99,7 @@ std::string EQEmuLogSys::FormatDebugCategoryMessageString(uint16 log_category, s return StringFormat("%s%s", category_string.c_str(), in_message.c_str()); } -void EQEmuLogSys::ProcessGMSay(uint16 log_type, uint16 log_category, std::string message) +void EQEmuLogSys::ProcessGMSay(uint16 log_category, std::string message) { /* Check if category enabled for process */ if (log_settings[log_category].log_to_gmsay == 0) @@ -186,7 +176,7 @@ void EQEmuLogSys::DebugCategory(DebugLevel debug_level, uint16 log_category, std std::string output_debug_message = EQEmuLogSys::FormatDebugCategoryMessageString(log_category, output_message); EQEmuLogSys::ProcessConsoleMessage(EQEmuLogSys::Debug, log_category, output_debug_message); - EQEmuLogSys::ProcessGMSay(EQEmuLogSys::Debug, log_category, output_debug_message); + EQEmuLogSys::ProcessGMSay(log_category, output_debug_message); EQEmuLogSys::ProcessLogWrite(EQEmuLogSys::Debug, log_category, output_debug_message); } diff --git a/common/eqemu_logsys.h b/common/eqemu_logsys.h index de49967db..42b39af7e 100644 --- a/common/eqemu_logsys.h +++ b/common/eqemu_logsys.h @@ -82,7 +82,6 @@ public: void CloseFileLogs(); void LoadLogSettingsDefaults(); - void Log(uint16 log_type, const std::string message, ...); void DebugCategory(DebugLevel debug_level, uint16 log_category, std::string message, ...); void MakeDirectory(std::string directory_name); void SetCurrentTimeStamp(char* time_stamp);