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

Additional cleanup + optimizations

Browse Source
This commit is contained in:
Amos 2022-02-21 12:06:05 +01:00
parent 7b971d0398
commit ae0b439a3c
5 changed files with 83 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
r5dev/gameui/IConsole.cpp
View File

@ -366,10 +366,10 @@ bool CConsole::CanAutoComplete(void)
// Show ConVar/ConCommand suggestions when at least 2 characters have been entered.
if (strlen(m_szInputBuf) > 1)
{
// Update suggestions if input buffer changed.
if (strcmp(m_szInputBuf, m_szInputBufOld) != 0)
static char szCurInputBuf[512]{};
if (strcmp(m_szInputBuf, szCurInputBuf) != 0) // Update suggestions if input buffer changed.
{
memmove(m_szInputBufOld, m_szInputBuf, strlen(m_szInputBuf) + 1);
memmove(szCurInputBuf, m_szInputBuf, strlen(m_szInputBuf) + 1);
FindFromPartial();
}
if ((int)m_vsvSuggest.size() <= 0)
@ -590,30 +590,35 @@ int CConsole::TextEditCallback(ImGuiInputTextCallbackData* iData)
}
case ImGuiInputTextFlags_CallbackAlways:
{
char szValue[256]{};
sprintf_s(szValue, 256, "%s", m_szInputBuf);
// Remove space or semicolon before we call 'g_pCVar->FindVar(..)'.
for (int i = 0; i < strlen(szValue); i++)
static char szCurInputBuf[512]{};
if (strcmp(m_szInputBuf, szCurInputBuf) != 0) // Only run if changed.
{
if (szValue[i] == ' ' || szValue[i] == ';')
char szValue[512]{};
memmove(szCurInputBuf, m_szInputBuf, strlen(m_szInputBuf) + 1);
sprintf_s(szValue, sizeof(szValue), "%s", m_szInputBuf);
// Remove space or semicolon before we call 'g_pCVar->FindVar(..)'.
for (int i = 0; i < strlen(szValue); i++)
{
szValue[i] = '\0';
if (szValue[i] == ' ' || szValue[i] == ';')
{
szValue[i] = '\0';
}
}
}
ConVar* pConVar = g_pCVar->FindVar(szValue);
if (pConVar != nullptr)
{
// Display the current and default value of ConVar if found.
snprintf(m_szSummary, 256, "(\"%s\", default \"%s\")", pConVar->GetString(), pConVar->GetDefault());
ConVar* pConVar = g_pCVar->FindVar(szValue);
if (pConVar != nullptr)
{
// Display the current and default value of ConVar if found.
snprintf(m_szSummary, 256, "(\"%s\", default \"%s\")", pConVar->GetString(), pConVar->GetDefault());
}
else
{
// Display amount of history items if ConVar cannot be found.
snprintf(m_szSummary, 256, "%llu history items", m_vsvHistory.size());
}
break;
}
else
{
// Display amount of history items if ConVar cannot be found.
snprintf(m_szSummary, 256, "%llu history items", m_vsvHistory.size());
}
break;
}
}
return 0;

2
r5dev/gameui/IConsole.h
View File

@ -5,7 +5,6 @@ class CConsole
private:
///////////////////////////////////////////////////////////////////////////
char m_szInputBuf[512] = { 0 };
char m_szInputBufOld[512] = { 0 };
char m_szSummary[256] = { 0 };
const char* m_pszConsoleTitle = { 0 };
@ -40,7 +39,6 @@ private:
ImGuiWindowFlags popup_window_flags =
ImGuiWindowFlags_NoMove |
/*ImGuiWindowFlags_NoResize |*/
ImGuiWindowFlags_NoTitleBar |
ImGuiWindowFlags_NoSavedSettings |
ImGuiWindowFlags_NoFocusOnAppearing |

2
r5dev/tier0/IConVar.cpp
View File

@ -264,7 +264,7 @@ float ConVar::GetMinValue(void) const
//-----------------------------------------------------------------------------
float ConVar::GetMaxValue(void) const
{
return m_pParent->m_flMaxValue;;
return m_pParent->m_flMaxValue;
}
//-----------------------------------------------------------------------------

6
r5dev/tier0/IConVar.h
View File

@ -30,8 +30,7 @@
#define FCVAR_NEVER_AS_STRING (1<<12) // never try to print that cvar
// It's a ConVar that's shared between the client and the server.
// At signon, the values of all such ConVars are sent from the server to the client (skipped for local
// client, of course )
// At signon, the values of all such ConVars are sent from the server to the client (skipped for local client, of course )
// If a change is requested it must come from the console (i.e., no remote client changes)
// If a value is changed while a server is active, it's replicated to all connected clients
#define FCVAR_REPLICATED (1<<13) // server setting enforced on clients, TODO rename to FCAR_SERVER at some time
@ -80,6 +79,9 @@ dq offset sub_1404701A0
dq offset RegisterConVar; #STR: "Convar '%s' is flagged as both FCVAR_ARCHIVE and FCVAR_ARC
*/
//-----------------------------------------------------------------------------
// Purpose: A console variable
//-----------------------------------------------------------------------------
class ConVar
{
public:

102
r5dev/tier0/cvar.cpp
View File

@ -5,81 +5,81 @@
//-----------------------------------------------------------------------------
// ENGINE |
ConVar* cm_debug_cmdquery = new ConVar();
ConVar* cm_return_false_cmdquery_all = new ConVar();
ConVar* cm_return_false_cmdquery_cheats = new ConVar();
ConVar* r_debug_overlay_nodecay = new ConVar();
ConVar* cm_debug_cmdquery = nullptr;
ConVar* cm_return_false_cmdquery_all = nullptr;
ConVar* cm_return_false_cmdquery_cheats = nullptr;
ConVar* r_debug_overlay_nodecay = nullptr;
ConVar* rcon_address = new ConVar();
ConVar* rcon_password = new ConVar();
ConVar* rcon_address = nullptr;
ConVar* rcon_password = nullptr;
//-----------------------------------------------------------------------------
// SERVER |
ConVar* sv_showconnecting = new ConVar();
ConVar* sv_pylonvisibility = new ConVar();
ConVar* sv_showconnecting = nullptr;
ConVar* sv_pylonvisibility = nullptr;
#ifdef DEDICATED
ConVar* sv_rcon_debug = new ConVar();
ConVar* sv_rcon_banpenalty = new ConVar(); // TODO
ConVar* sv_rcon_maxfailures = new ConVar();
ConVar* sv_rcon_maxignores = new ConVar();
ConVar* sv_rcon_maxsockets = new ConVar();
ConVar* sv_rcon_whitelist_address = new ConVar();
ConVar* sv_rcon_debug = nullptr;
ConVar* sv_rcon_banpenalty = nullptr; // TODO
ConVar* sv_rcon_maxfailures = nullptr;
ConVar* sv_rcon_maxignores = nullptr;
ConVar* sv_rcon_maxsockets = nullptr;
ConVar* sv_rcon_whitelist_address = nullptr;
#endif // DEDICATED
//-----------------------------------------------------------------------------
// CLIENT |
#ifndef DEDICATED
ConVar* cl_drawconsoleoverlay = new ConVar();
ConVar* cl_consoleoverlay_lines = new ConVar();
ConVar* cl_consoleoverlay_offset_x = new ConVar();
ConVar* cl_consoleoverlay_offset_y = new ConVar();
ConVar* cl_drawconsoleoverlay = nullptr;
ConVar* cl_consoleoverlay_lines = nullptr;
ConVar* cl_consoleoverlay_offset_x = nullptr;
ConVar* cl_consoleoverlay_offset_y = nullptr;
ConVar* cl_conoverlay_script_server_clr = new ConVar();
ConVar* cl_conoverlay_script_client_clr = new ConVar();
ConVar* cl_conoverlay_script_ui_clr = new ConVar();
ConVar* cl_conoverlay_native_server_clr = new ConVar();
ConVar* cl_conoverlay_native_client_clr = new ConVar();
ConVar* cl_conoverlay_native_ui_clr = new ConVar();
ConVar* cl_conoverlay_native_engine_clr = new ConVar();
ConVar* cl_conoverlay_native_fs_clr = new ConVar();
ConVar* cl_conoverlay_native_rtech_clr = new ConVar();
ConVar* cl_conoverlay_native_ms_clr = new ConVar();
ConVar* cl_conoverlay_netcon_clr = new ConVar();
ConVar* cl_conoverlay_warning_clr = new ConVar();
ConVar* cl_conoverlay_error_clr = new ConVar();
ConVar* cl_conoverlay_script_server_clr = nullptr;
ConVar* cl_conoverlay_script_client_clr = nullptr;
ConVar* cl_conoverlay_script_ui_clr = nullptr;
ConVar* cl_conoverlay_native_server_clr = nullptr;
ConVar* cl_conoverlay_native_client_clr = nullptr;
ConVar* cl_conoverlay_native_ui_clr = nullptr;
ConVar* cl_conoverlay_native_engine_clr = nullptr;
ConVar* cl_conoverlay_native_fs_clr = nullptr;
ConVar* cl_conoverlay_native_rtech_clr = nullptr;
ConVar* cl_conoverlay_native_ms_clr = nullptr;
ConVar* cl_conoverlay_netcon_clr = nullptr;
ConVar* cl_conoverlay_warning_clr = nullptr;
ConVar* cl_conoverlay_error_clr = nullptr;
ConVar* cl_showsimstats = new ConVar();
ConVar* cl_simstats_offset_x = new ConVar();
ConVar* cl_simstats_offset_y = new ConVar();
ConVar* cl_showsimstats = nullptr;
ConVar* cl_simstats_offset_x = nullptr;
ConVar* cl_simstats_offset_y = nullptr;
ConVar* cl_showgpustats = new ConVar();
ConVar* cl_gpustats_offset_x = new ConVar();
ConVar* cl_gpustats_offset_y = new ConVar();
ConVar* cl_showgpustats = nullptr;
ConVar* cl_gpustats_offset_x = nullptr;
ConVar* cl_gpustats_offset_y = nullptr;
ConVar* con_max_size_logvector = new ConVar();
ConVar* con_suggestion_limit = new ConVar();
ConVar* con_suggestion_helptext = new ConVar();
ConVar* con_max_size_logvector = nullptr;
ConVar* con_suggestion_limit = nullptr;
ConVar* con_suggestion_helptext = nullptr;
#endif // !DEDICATED
//-----------------------------------------------------------------------------
// FILESYSTEM |
ConVar* fs_warning_level_sdk = new ConVar();
ConVar* fs_show_warning_output = new ConVar();
ConVar* fs_packedstore_entryblock_stats = new ConVar();
ConVar* fs_warning_level_sdk = nullptr;
ConVar* fs_show_warning_output = nullptr;
ConVar* fs_packedstore_entryblock_stats = nullptr;
//-----------------------------------------------------------------------------
// MATERIALSYSTEM |
#ifndef DEDICATED
ConVar* mat_showdxoutput = new ConVar();
ConVar* mat_showdxoutput = nullptr;
#endif // !DEDICATED
//-----------------------------------------------------------------------------
// SQUIRREL |
ConVar* sq_showrsonloading = new ConVar();
ConVar* sq_showscriptloading = new ConVar();
ConVar* sq_showvmoutput = new ConVar();
ConVar* sq_showvmwarning = new ConVar();
ConVar* sq_showrsonloading = nullptr;
ConVar* sq_showscriptloading = nullptr;
ConVar* sq_showvmoutput = nullptr;
ConVar* sq_showvmwarning = nullptr;
//-----------------------------------------------------------------------------
// NETCHANNEL |
ConVar* net_userandomkey = new ConVar();
ConVar* r5net_matchmaking_hostname = new ConVar();
ConVar* r5net_show_debug = new ConVar();
ConVar* net_userandomkey = nullptr;
ConVar* r5net_matchmaking_hostname = nullptr;
ConVar* r5net_show_debug = nullptr;
//-----------------------------------------------------------------------------
// Purpose: finds base commands.