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

Move LogType_t to dbg.h

Browse Source 
Renamed to EGlobalContext_t and used globally for all context types combined into one (required for rcon messages for example, as we do native and script messages, while also retaining colors).
This commit is contained in:
Kawe Mazidjatari 2022-08-17 12:28:52 +02:00
parent 619ac76452
commit 9019e5cb70
7 changed files with 79 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/engine/client/cl_rcon.cpp
View File

@ -303,7 +303,7 @@ void CRConClient::ProcessMessage(const sv_rcon::response& sv_response) const
}
case sv_rcon::response_t::SERVERDATA_RESPONSE_CONSOLE_LOG:
{
NetMsg(sv_response.responseid(), svOut.c_str());
NetMsg(static_cast<EGlobalContext_t>(sv_response.responseid()), svOut.c_str());
break;
}
default:

8
r5dev/engine/server/sv_rcon.cpp
View File

@ -245,7 +245,7 @@ void CRConServer::Recv(void)
{//////////////////////////////////////////////
if (this->CheckForBan(pData))
{
this->Send(pData->m_hSocket, this->Serialize(s_pszBannedMessage, "", sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH, 7/*NETCON_S*/));
this->Send(pData->m_hSocket, this->Serialize(s_pszBannedMessage, "", sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH, static_cast<int>(EGlobalContext_t::NETCON_S)));
this->CloseConnection();
continue;
}
@ -353,7 +353,7 @@ void CRConServer::Authenticate(const cl_rcon::request& cl_request, CConnectedNet
m_pSocket->CloseListenSocket();
this->CloseNonAuthConnection();
this->Send(pData->m_hSocket, this->Serialize(s_pszAuthMessage, sv_rcon_sendlogs->GetString(), sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH, 7/*NETCON_S*/));
this->Send(pData->m_hSocket, this->Serialize(s_pszAuthMessage, sv_rcon_sendlogs->GetString(), sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH, static_cast<int>(EGlobalContext_t::NETCON_S)));
}
else // Bad password.
{
@ -363,7 +363,7 @@ void CRConServer::Authenticate(const cl_rcon::request& cl_request, CConnectedNet
DevMsg(eDLL_T::SERVER, "Bad RCON password attempt from '%s'\n", netAdr2.GetIPAndPort().c_str());
}
this->Send(pData->m_hSocket, this->Serialize(s_pszWrongPwMessage, "", sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH, 7/*NETCON_S*/));
this->Send(pData->m_hSocket, this->Serialize(s_pszWrongPwMessage, "", sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH, static_cast<int>(EGlobalContext_t::NETCON_S)));
pData->m_bAuthorized = false;
pData->m_bValidated = false;
@ -475,7 +475,7 @@ void CRConServer::ProcessMessage(const cl_rcon::request& cl_request)
&& cl_request.requesttype() != cl_rcon::request_t::SERVERDATA_REQUEST_AUTH)
{
// Notify net console that authentication is required.
this->Send(pData->m_hSocket, this->Serialize(s_pszNoAuthMessage, "", sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH, 7/*NETCON_S*/));
this->Send(pData->m_hSocket, this->Serialize(s_pszNoAuthMessage, "", sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH, static_cast<int>(EGlobalContext_t::NETCON_S)));
pData->m_bValidated = false;
pData->m_nIgnoredMessage++;

4
r5dev/squirrel/sqvm.cpp
View File

@ -200,7 +200,7 @@ SQRESULT SQVM_PrintFunc(HSQUIRRELVM v, SQChar* fmt, ...)
}
g_pConsole->AddLog(ConLog_t(g_spd_sys_w_oss.str(), color));
g_pLogSystem.AddLog(static_cast<LogType_t>(nResponseId), g_spd_sys_w_oss.str());
g_pLogSystem.AddLog(static_cast<EGlobalContext_t>(nResponseId), g_spd_sys_w_oss.str());
g_spd_sys_w_oss.str("");
g_spd_sys_w_oss.clear();
@ -292,7 +292,7 @@ SQRESULT SQVM_WarningFunc(HSQUIRRELVM v, SQInteger a2, SQInteger a3, SQInteger*
iconsole->debug(vmStr); // Emit to in-game console.
g_pConsole->AddLog(ConLog_t(g_spd_sys_w_oss.str(), ImVec4(1.00f, 1.00f, 0.00f, 0.80f)));
g_pLogSystem.AddLog(LogType_t::WARNING_C, g_spd_sys_w_oss.str());
g_pLogSystem.AddLog(EGlobalContext_t::WARNING_C, g_spd_sys_w_oss.str());
g_spd_sys_w_oss.str("");
g_spd_sys_w_oss.clear();

52
r5dev/tier0/dbg.cpp
View File

@ -94,7 +94,7 @@ PLATFORM_INTERFACE void AssertValidWStringPtr(const wchar_t* ptr, int maxchar/*
// Input : context -
// *fmt - ... -
//-----------------------------------------------------------------------------
void NetMsg(int context, const char* fmt, ...)
void NetMsg(EGlobalContext_t context, const char* fmt, ...)
{
#ifndef DEDICATED
static char szBuf[4096] = {};
@ -105,10 +105,10 @@ void NetMsg(int context, const char* fmt, ...)
static std::shared_ptr<spdlog::logger> ntlogger = spdlog::get("net_con");
switch (context)
{
case -4:
case -3:
case -2:
case -1:
case EGlobalContext_t::GLOBAL_NONE:
case EGlobalContext_t::SCRIPT_SERVER:
case EGlobalContext_t::SCRIPT_CLIENT:
case EGlobalContext_t::SCRIPT_UI:
{
s_LogMutex.lock();
{/////////////////////////////
@ -131,24 +131,24 @@ void NetMsg(int context, const char* fmt, ...)
if (svOut.find("\033[38;2;255;255;000m") != std::string::npos)
{ // Warning.
color = ImVec4(1.00f, 1.00f, 0.00f, 0.80f);
context = static_cast<int>(LogType_t::WARNING_C);
context = EGlobalContext_t::WARNING_C;
}
else if (svOut.find("\033[38;2;255;000;000m") != std::string::npos)
{ // Error.
color = ImVec4(1.00f, 0.00f, 0.00f, 0.80f);
context = static_cast<int>(LogType_t::ERROR_C);
context = EGlobalContext_t::ERROR_C;
}
else
{
switch (context)
{
case -3: // [ SERVER ]
case EGlobalContext_t::SCRIPT_SERVER: // [ SERVER ]
color = ImVec4(0.59f, 0.58f, 0.73f, 1.00f);
break;
case -2: // [ CLIENT ]
case EGlobalContext_t::SCRIPT_CLIENT: // [ CLIENT ]
color = ImVec4(0.59f, 0.58f, 0.63f, 1.00f);
break;
case -1: // [ UI ]
case EGlobalContext_t::SCRIPT_UI: // [ UI ]
color = ImVec4(0.59f, 0.48f, 0.53f, 1.00f);
break;
default:
@ -172,7 +172,7 @@ void NetMsg(int context, const char* fmt, ...)
iconsole->debug(svOut);
g_pConsole->AddLog(ConLog_t(g_spd_sys_w_oss.str(), color));
g_pLogSystem.AddLog(static_cast<LogType_t>(context), g_spd_sys_w_oss.str());
g_pLogSystem.AddLog(static_cast<EGlobalContext_t>(context), g_spd_sys_w_oss.str());
g_spd_sys_w_oss.str("");
g_spd_sys_w_oss.clear();
@ -181,15 +181,15 @@ void NetMsg(int context, const char* fmt, ...)
break;
}
case 0:
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
case 7:
case 8:
case EGlobalContext_t::NATIVE_SERVER:
case EGlobalContext_t::NATIVE_CLIENT:
case EGlobalContext_t::NATIVE_UI:
case EGlobalContext_t::NATIVE_ENGINE:
case EGlobalContext_t::NATIVE_FS:
case EGlobalContext_t::NATIVE_RTECH:
case EGlobalContext_t::NATIVE_MS:
case EGlobalContext_t::NETCON_S:
case EGlobalContext_t::COMMON_C:
{
s_LogMutex.lock();
{/////////////////////////////
@ -212,12 +212,12 @@ void NetMsg(int context, const char* fmt, ...)
if (svOut.find("\033[38;2;255;255;000;") != std::string::npos)
{ // Warning.
color = ImVec4(1.00f, 1.00f, 0.00f, 0.80f);
context = static_cast<int>(LogType_t::WARNING_C);
context = EGlobalContext_t::WARNING_C;
}
else if (svOut.find("\033[38;2;255;000;000;") != std::string::npos)
{ // Error.
color = ImVec4(1.00f, 0.00f, 0.00f, 0.80f);
context = static_cast<int>(LogType_t::ERROR_C);
context = EGlobalContext_t::ERROR_C;
}
else
{
@ -271,7 +271,7 @@ void NetMsg(int context, const char* fmt, ...)
iconsole->info(svOut);
g_pConsole->AddLog(ConLog_t(g_spd_sys_w_oss.str(), color));
g_pLogSystem.AddLog(static_cast<LogType_t>(context), g_spd_sys_w_oss.str());
g_pLogSystem.AddLog(context, g_spd_sys_w_oss.str());
g_spd_sys_w_oss.str("");
g_spd_sys_w_oss.clear();
@ -349,7 +349,7 @@ void DevMsg(eDLL_T context, const char* fmt, ...)
#ifndef DEDICATED
iconsole->info(svOut);
LogType_t tLog = static_cast<LogType_t>(context);
EGlobalContext_t tLog = static_cast<EGlobalContext_t>(context);
ImVec4 color;
switch (context)
@ -464,7 +464,7 @@ void Warning(eDLL_T context, const char* fmt, ...)
iconsole->info(svOut);
g_pConsole->AddLog(ConLog_t(g_spd_sys_w_oss.str(), ImVec4(1.00f, 1.00f, 0.00f, 0.80f)));
g_pLogSystem.AddLog(LogType_t::WARNING_C, g_spd_sys_w_oss.str());
g_pLogSystem.AddLog(EGlobalContext_t::WARNING_C, g_spd_sys_w_oss.str());
g_spd_sys_w_oss.str("");
g_spd_sys_w_oss.clear();
@ -541,7 +541,7 @@ void Error(eDLL_T context, const char* fmt, ...)
iconsole->info(svOut);
g_pConsole->AddLog(ConLog_t(g_spd_sys_w_oss.str(), ImVec4(1.00f, 0.00f, 0.00f, 1.00f)));
g_pLogSystem.AddLog(LogType_t::ERROR_C, g_spd_sys_w_oss.str());
g_pLogSystem.AddLog(EGlobalContext_t::ERROR_C, g_spd_sys_w_oss.str());
g_spd_sys_w_oss.str("");
g_spd_sys_w_oss.clear();

22
r5dev/tier0/dbg.h
View File

@ -13,6 +13,26 @@
bool HushAsserts();
//-----------------------------------------------------------------------------
enum class EGlobalContext_t : int
{
GLOBAL_NONE = -4,
SCRIPT_SERVER,
SCRIPT_CLIENT,
SCRIPT_UI,
NATIVE_SERVER,
NATIVE_CLIENT,
NATIVE_UI,
NATIVE_ENGINE,
NATIVE_FS,
NATIVE_RTECH,
NATIVE_MS,
NETCON_S,
COMMON_C,
WARNING_C,
ERROR_C,
NONE
};
enum class eDLL_T : int
{
SERVER = 0, // Game DLL
@ -58,7 +78,7 @@ extern std::mutex s_LogMutex;
//////////////////////////////////////////////////////////////////////////
// These functions do not return.
PLATFORM_INTERFACE void NetMsg(int context, const char* fmt, ...) FMTFUNCTION(2, 3);
PLATFORM_INTERFACE void NetMsg(EGlobalContext_t context, const char* fmt, ...) FMTFUNCTION(2, 3);
PLATFORM_INTERFACE void DevMsg(eDLL_T context, const char* fmt, ...) FMTFUNCTION(2, 3);
PLATFORM_INTERFACE void Warning(eDLL_T context, const char* fmt, ...) FMTFUNCTION(1, 2);
PLATFORM_INTERFACE void Error(eDLL_T context, const char* fmt, ...) FMTFUNCTION(1, 2);

38
r5dev/vgui/vgui_debugpanel.cpp
View File

@ -61,11 +61,11 @@ void CLogSystem::Update(void)
//-----------------------------------------------------------------------------
// Purpose: add a log to the vector.
//-----------------------------------------------------------------------------
void CLogSystem::AddLog(LogType_t type, string svMessage)
void CLogSystem::AddLog(const EGlobalContext_t context, const string& svText)
{
if (svMessage.length() > 0)
if (svText.length() > 0)
{
m_vLogs.push_back(LogMsg_t{ svMessage, 1024, type });
m_vLogs.push_back(LogMsg_t{ svText, 1024, context });
}
}
@ -230,37 +230,37 @@ void CLogSystem::DrawStreamOverlay(void) const
//-----------------------------------------------------------------------------
// Purpose: get log color for passed type.
//-----------------------------------------------------------------------------
Color CLogSystem::GetLogColorForType(LogType_t type) const
Color CLogSystem::GetLogColorForType(const EGlobalContext_t context) const
{
switch (type)
switch (context)
{
case LogType_t::SCRIPT_SERVER:
case EGlobalContext_t::SCRIPT_SERVER:
return { cl_conoverlay_script_server_clr->GetColor() };
case LogType_t::SCRIPT_CLIENT:
case EGlobalContext_t::SCRIPT_CLIENT:
return { cl_conoverlay_script_client_clr->GetColor() };
case LogType_t::SCRIPT_UI:
case EGlobalContext_t::SCRIPT_UI:
return { cl_conoverlay_script_ui_clr->GetColor() };
case LogType_t::NATIVE_SERVER:
case EGlobalContext_t::NATIVE_SERVER:
return { cl_conoverlay_native_server_clr->GetColor() };
case LogType_t::NATIVE_CLIENT:
case EGlobalContext_t::NATIVE_CLIENT:
return { cl_conoverlay_native_client_clr->GetColor() };
case LogType_t::NATIVE_UI:
case EGlobalContext_t::NATIVE_UI:
return { cl_conoverlay_native_ui_clr->GetColor() };
case LogType_t::NATIVE_ENGINE:
case EGlobalContext_t::NATIVE_ENGINE:
return { cl_conoverlay_native_engine_clr->GetColor() };
case LogType_t::NATIVE_FS:
case EGlobalContext_t::NATIVE_FS:
return { cl_conoverlay_native_fs_clr->GetColor() };
case LogType_t::NATIVE_RTECH:
case EGlobalContext_t::NATIVE_RTECH:
return { cl_conoverlay_native_rtech_clr->GetColor() };
case LogType_t::NATIVE_MS:
case EGlobalContext_t::NATIVE_MS:
return { cl_conoverlay_native_ms_clr->GetColor() };
case LogType_t::NETCON_S:
case EGlobalContext_t::NETCON_S:
return { cl_conoverlay_netcon_clr->GetColor() };
case LogType_t::COMMON_C:
case EGlobalContext_t::COMMON_C:
return { cl_conoverlay_common_clr->GetColor() };
case LogType_t::WARNING_C:
case EGlobalContext_t::WARNING_C:
return { cl_conoverlay_warning_clr->GetColor() };
case LogType_t::ERROR_C:
case EGlobalContext_t::ERROR_C:
return { cl_conoverlay_error_clr->GetColor() };
default:
return { cl_conoverlay_native_engine_clr->GetColor() };

31
r5dev/vgui/vgui_debugpanel.h
View File

@ -2,36 +2,17 @@
#include "core/stdafx.h"
#include "mathlib/color.h"
enum class LogType_t : int
{
SCRIPT_SERVER = -3,
SCRIPT_CLIENT,
SCRIPT_UI,
NATIVE_SERVER,
NATIVE_CLIENT,
NATIVE_UI,
NATIVE_ENGINE,
NATIVE_FS,
NATIVE_RTECH,
NATIVE_MS,
NETCON_S,
COMMON_C,
WARNING_C,
ERROR_C,
NONE
};
struct LogMsg_t
{
LogMsg_t(const string svMessage, const int nTicks, const LogType_t type)
LogMsg_t(const string svMessage, const int nTicks, const EGlobalContext_t type)
{
this->m_svMessage = svMessage;
this->m_nTicks = nTicks;
this->m_type = type;
}
string m_svMessage = "";
int m_nTicks = 1024;
LogType_t m_type = LogType_t::NONE;
string m_svMessage = "";
int m_nTicks = 1024;
EGlobalContext_t m_type = EGlobalContext_t::NONE;
};
class CLogSystem
@ -44,7 +25,7 @@ public:
}
void Update(void);
void AddLog(LogType_t type, string svText);
void AddLog(const EGlobalContext_t context, const string& svText);
void DrawLog(void);
void DrawHostStats(void) const;
void DrawSimStats(void) const;
@ -53,7 +34,7 @@ public:
void DrawStreamOverlay(void) const;
private:
Color GetLogColorForType(LogType_t type) const;
Color GetLogColorForType(const EGlobalContext_t type) const;
vector<LogMsg_t> m_vLogs;
int m_nFontHeight;