From 87994ebfba8511892a12b442228d32981937302a Mon Sep 17 00:00:00 2001 From: SecretsOTheP Date: Sun, 20 Apr 2014 00:26:54 -0400 Subject: [PATCH] smoke commits everyday --- changelog.txt | 3 +++ common/debug.cpp | 6 ------ zone/client.cpp | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/changelog.txt b/changelog.txt index 2e314b440..e1cbd7f80 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,8 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) ------------------------------------------------------- +== 04/20/2014 == +Secrets: Changed the functionality of EQDEBUG cmake flag. It now suppresses logs, but shows crashes in any scenario when set to 1. It will also now show crashes even if the log system is disabled. + == 04/18/2014 == Akkadius: Added #command error message suppression for those who don't want to see 'Command is not recognized' constantly - You need to have rule 'Chat:SuppressCommandErrors' set to true, this is set to false by default diff --git a/common/debug.cpp b/common/debug.cpp index badd337c1..632ca7b01 100644 --- a/common/debug.cpp +++ b/common/debug.cpp @@ -42,22 +42,16 @@ EQEMuLog::EQEMuLog() { for (int i=0; i= 2 pLogStatus[i] = 1 | 2; -#else - pLogStatus[i] = 0; -#endif logCallbackFmt[i] = nullptr; logCallbackBuf[i] = nullptr; logCallbackPva[i] = nullptr; } // TODO: Make this read from an ini or something, everyone has different opinions on what it should be -#if EQDEBUG < 2 pLogStatus[Status] = 2; pLogStatus[Error] = 2; pLogStatus[Quest] = 2; pLogStatus[Commands] = 1; -#endif logFileValid = true; } diff --git a/zone/client.cpp b/zone/client.cpp index 702303c5c..7aa7bd748 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -8162,7 +8162,7 @@ void Client::Consume(const Item_Struct *item, uint8 type, int16 slot, bool auto_ if(!auto_consume) //no message if the client consumed for us entity_list.MessageClose_StringID(this, true, 50, 0, EATING_MESSAGE, GetName(), item->Name); -#if EQDEBUG >= 1 +#if EQDEBUG >= 5 LogFile->write(EQEMuLog::Debug, "Eating from slot:%i", (int)slot); #endif } @@ -8179,7 +8179,7 @@ void Client::Consume(const Item_Struct *item, uint8 type, int16 slot, bool auto_ if(!auto_consume) //no message if the client consumed for us entity_list.MessageClose_StringID(this, true, 50, 0, DRINKING_MESSAGE, GetName(), item->Name); -#if EQDEBUG >= 1 +#if EQDEBUG >= 5 LogFile->write(EQEMuLog::Debug, "Drinking from slot:%i", (int)slot); #endif }