diff --git a/src/engine/client/ghost.cpp b/src/engine/client/ghost.cpp index 96b4a701f..ac89c6b0e 100644 --- a/src/engine/client/ghost.cpp +++ b/src/engine/client/ghost.cpp @@ -11,7 +11,7 @@ static const unsigned char gs_aHeaderMarker[8] = {'T', 'W', 'G', 'H', 'O', 'S', static const unsigned char gs_CurVersion = 6; static const int gs_NumTicksOffset = 93; -static const ColorRGBA gs_GhostPrintColor{0.6f, 0.6f, 0.6f, 1.0f}; +static const ColorRGBA gs_GhostPrintColor{0.65f, 0.6f, 0.6f, 1.0f}; CGhostRecorder::CGhostRecorder() { diff --git a/src/engine/console.h b/src/engine/console.h index c66a8f730..86d2ee9b2 100644 --- a/src/engine/console.h +++ b/src/engine/console.h @@ -7,6 +7,8 @@ #include #include +static const ColorRGBA gs_ConsoleDefaultColor(1, 1, 1, 1); + class IConsole : public IInterface { MACRO_INTERFACE("console", 0) @@ -103,7 +105,7 @@ public: virtual int RegisterPrintCallback(int OutputLevel, FPrintCallback pfnPrintCallback, void *pUserData) = 0; virtual void SetPrintOutputLevel(int Index, int OutputLevel) = 0; virtual char *Format(char *pBuf, int Size, const char *pFrom, const char *pStr) = 0; - virtual void Print(int Level, const char *pFrom, const char *pStr, ColorRGBA PrintColor = {1, 1, 1, 1}) = 0; + virtual void Print(int Level, const char *pFrom, const char *pStr, ColorRGBA PrintColor = gs_ConsoleDefaultColor) = 0; virtual void SetTeeHistorianCommandCallback(FTeeHistorianCommandCallback pfnCallback, void *pUser) = 0; virtual void SetAccessLevel(int AccessLevel) = 0; diff --git a/src/engine/shared/console.cpp b/src/engine/shared/console.cpp index 75e1289db..b08147001 100644 --- a/src/engine/shared/console.cpp +++ b/src/engine/shared/console.cpp @@ -315,7 +315,11 @@ char *CConsole::Format(char *pBuf, int Size, const char *pFrom, const char *pStr void CConsole::Print(int Level, const char *pFrom, const char *pStr, ColorRGBA PrintColor) { - set_console_msg_color(&PrintColor); + // if the color is pure white, use default terminal color + if(mem_comp(&PrintColor, &gs_ConsoleDefaultColor, sizeof(ColorRGBA)) == 0) + set_console_msg_color(NULL); + else + set_console_msg_color(&PrintColor); dbg_msg(pFrom, "%s", pStr); set_console_msg_color(NULL); char aBuf[1024]; diff --git a/src/engine/shared/console.h b/src/engine/shared/console.h index b1888b2f4..050b415ca 100644 --- a/src/engine/shared/console.h +++ b/src/engine/shared/console.h @@ -218,7 +218,7 @@ public: virtual int RegisterPrintCallback(int OutputLevel, FPrintCallback pfnPrintCallback, void *pUserData); virtual void SetPrintOutputLevel(int Index, int OutputLevel); virtual char *Format(char *pBuf, int Size, const char *pFrom, const char *pStr); - virtual void Print(int Level, const char *pFrom, const char *pStr, ColorRGBA PrintColor = {1, 1, 1, 1}); + virtual void Print(int Level, const char *pFrom, const char *pStr, ColorRGBA PrintColor = gs_ConsoleDefaultColor); virtual void SetTeeHistorianCommandCallback(FTeeHistorianCommandCallback pfnCallback, void *pUser); void SetAccessLevel(int AccessLevel) { m_AccessLevel = clamp(AccessLevel, (int)(ACCESS_LEVEL_ADMIN), (int)(ACCESS_LEVEL_USER)); } diff --git a/src/engine/shared/demo.cpp b/src/engine/shared/demo.cpp index 3aadbeea4..c50565af7 100644 --- a/src/engine/shared/demo.cpp +++ b/src/engine/shared/demo.cpp @@ -28,7 +28,7 @@ static const unsigned char s_VersionTickCompression = 5; // demo files with this static const int s_LengthOffset = 152; static const int s_NumMarkersOffset = 176; -static const ColorRGBA gs_DemoPrintColor{0.7f, 0.7f, 0.7f, 1.0f}; +static const ColorRGBA gs_DemoPrintColor{0.75f, 0.7f, 0.7f, 1.0f}; CDemoRecorder::CDemoRecorder(class CSnapshotDelta *pSnapshotDelta, bool NoMapData) {