diff --git a/common/eqemu_logsys.cpp b/common/eqemu_logsys.cpp index 1d0af0bb4..73317e525 100644 --- a/common/eqemu_logsys.cpp +++ b/common/eqemu_logsys.cpp @@ -69,7 +69,6 @@ static const char* TypeNames[EQEmuLogSys::MaxLogID] = { "Quest", "Command", "Crash", - "Save", }; /* If you add to this, make sure you update LogCategory in eqemu_logsys.h */ @@ -155,6 +154,7 @@ void EQEmuLogSys::LogDebug(DebugLevel debug_level, std::string message, ...) va_start(args, message); std::string output_message = vStringFormat(message.c_str(), args); va_end(args); + EQEmuLogSys::Log(EQEmuLogSys::LogType::Debug, output_message); } @@ -192,7 +192,7 @@ void EQEmuLogSys::Log(uint16 log_type, const std::string message, ...) va_end(args); if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformZone){ - on_log_gmsay_hook(output_message); + on_log_gmsay_hook(log_type, output_message); } EQEmuLogSys::ConsoleMessage(log_type, output_message); diff --git a/common/eqemu_logsys.h b/common/eqemu_logsys.h index 037a06feb..8d577bfc1 100644 --- a/common/eqemu_logsys.h +++ b/common/eqemu_logsys.h @@ -39,7 +39,6 @@ public: Quest, /* Quest Logs */ Commands, /* Issued Commands */ Crash, /* Crash Logs */ - Save, /* Client Saves */ MaxLogID /* Max, used in functions to get the max log ID */ }; @@ -74,13 +73,13 @@ public: void CloseZoneLogs(); void ConsoleMessage(uint16 log_type, const std::string message); + void LoadLogSettings(); void Log(uint16 log_type, const std::string message, ...); void LogDebug(DebugLevel debug_level, std::string message, ...); void LogDebugType(DebugLevel debug_level, uint16 log_type, std::string message, ...); void MakeDirectory(std::string directory_name); void SetCurrentTimeStamp(char* time_stamp); void StartLogs(const std::string log_name); - void LoadLogSettings(); struct LogSettings{ uint8 log_to_file; @@ -92,7 +91,7 @@ public: bool log_settings_loaded = false; int log_platform = 0; - void OnLogHookCallBack(std::function f) { on_log_gmsay_hook = f; } + void OnLogHookCallBackZone(std::function f) { on_log_gmsay_hook = f; } private: bool zone_general_init = false; diff --git a/zone/net.cpp b/zone/net.cpp index 601a598e5..c10c2b00c 100644 --- a/zone/net.cpp +++ b/zone/net.cpp @@ -116,7 +116,7 @@ extern void MapOpcodes(); int main(int argc, char** argv) { RegisterExecutablePlatform(ExePlatformZone); logger.LoadLogSettings(); - logger.OnLog(&ClientLogs::ClientMessage); + logger.OnLogHookCallBackZone(&ClientLogs::ClientMessage); set_exception_handler(); const char *zone_name;