R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

More reliable way of enablin ansi colors on netconsole

Browse Source 
Compare arguments individually instead of performing a scan over the whole command line string.
This commit is contained in:
Kawe Mazidjatari 2023-08-04 15:36:40 +02:00
parent e7420a26af
commit 461fb48575
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
r5dev/netconsole/netconsole.cpp
View File

@ -40,7 +40,7 @@ CNetCon::~CNetCon(void)
// Purpose: WSA and NETCON systems init
// Output : true on success, false otherwise
//-----------------------------------------------------------------------------
bool CNetCon::Init(void)
bool CNetCon::Init(const bool bAnsiColor)
{
g_CoreMsgVCallback = &EngineLoggerSink;
@ -55,7 +55,7 @@ bool CNetCon::Init(void)
m_bInitialized = true;
TermSetup();
TermSetup(bAnsiColor);
DevMsg(eDLL_T::NONE, "R5 TCP net console [Version %s]\n", NETCON_VERSION);
static std::thread frame([this]()
@ -100,13 +100,10 @@ bool CNetCon::Shutdown(void)
//-----------------------------------------------------------------------------
// Purpose: terminal setup
//-----------------------------------------------------------------------------
void CNetCon::TermSetup(void)
void CNetCon::TermSetup(const bool bAnsiColor)
{
const char* pszCommandLine = GetCommandLineA();
const bool bEnableColor = strstr("-ansicolor", pszCommandLine) != nullptr;
SpdLog_Init(bEnableColor);
Console_Init(bEnableColor);
SpdLog_Init(bAnsiColor);
Console_Init(bAnsiColor);
}
//-----------------------------------------------------------------------------
@ -360,7 +357,18 @@ bool CNetCon::IsConnected(void)
//-----------------------------------------------------------------------------
int main(int argc, char* argv[])
{
if (!NetConsole()->Init())
bool bEnableColor = false;
for (int i = 0; i < argc; i++)
{
if (V_strcmp(argv[i], "-ansicolor") == NULL)
{
bEnableColor = true;
break;
}
}
if (!NetConsole()->Init(bEnableColor))
{
return EXIT_FAILURE;
}

4
r5dev/netconsole/netconsole.h
View File

@ -17,10 +17,10 @@ public:
CNetCon(void);
~CNetCon(void);
bool Init(void);
bool Init(const bool bAnsiColor);
bool Shutdown(void);
void TermSetup(void);
void TermSetup(const bool bAnsiColor);
void UserInput(void);
void ClearInput(void);