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

Prune ununsed/useless cvars

Browse Source 
Also removed these from the CFG files.
* 'sq_showvmoutput' has been renamed to 'script_show_output'.
* 'sq_showvmwarning' has been renamed to 'script_show_warning'.
This commit is contained in:
Kawe Mazidjatari 2023-03-26 18:18:50 +02:00
parent 4cb8f3f019
commit 27ddc30d68
9 changed files with 14 additions and 62 deletions

8
r5dev/resource/cfg/autoexec.cfg

@ -2,11 +2,3 @@
//// REPLICATED ////
//////////////////////////
mp_allowed "1" // Whether multiplayer is allowed or not.
//////////////////////////
//// SQUIRREL ////
//////////////////////////
sq_showrsonloading "1" // Shows the global include files the SQVM is loading for loading scripts.
sq_showscriptloading "0" // Shows the script files the SQVM is loading for precompile job.
sq_showvmoutput "1" // Shows the VM output. 1 = Log to file. 2 = 1 + log to console. 3 = 1 + 2 + log to overhead console. 4 = only log to overhead console.
sq_showvmwarning "1" // Shows the VM warning output. 1 = Log to file. 2 = 1 + log to console.

10
r5dev/resource/cfg/autoexec_client.cfg

@ -9,19 +9,9 @@ cl_noTimeoutLocalHost "0" // Do not time-out on local conne
//////////////////////////
//// DEBUG TEXT ////
//////////////////////////
cl_showfps "0" // Shows detailed client/server stats.
cl_showpos "0" // Shows detailed position stats.
cl_showsimstats "0" // Shows detailed simulation stats.
cl_showgpustats "0" // Shows detailed GPU memory stats.
phys_showObjectCount "0" // Shows physics object count.
rui_defaultDebugFontFace "ArameMono" // Sets the RUI debug font face.
//////////////////////////
//// PLATFORM ////
//////////////////////////
origin_disconnectWhenOffline "0" // Whether the client disconnect itself from the server if Origin is offline.
//////////////////////////
//// MATSYS ////
//////////////////////////
mat_showdxoutput "0" // Shows debug information from the DirectX hook system.

1
r5dev/resource/cfg/autoexec_client_dev.cfg

@ -70,7 +70,6 @@ cl_ent_absbox "1" // Display entity abs bo
//////////////////////////
//// MATSYS ////
//////////////////////////
mat_showdxoutput "1" // Shows debug information from the DirectX hook system.
gl_clear_color_buffer "1" // Enable or disable the clearing of the main color buffer.
//mat_sync_rt "1" // Enable to debug render threads more easily ( !slower! ).
//mat_sync_rt_flushes_gpu "1" // Enable to debug render threads more easily ( !slower! ).

16
r5dev/resource/cfg/autoexec_dev.cfg

@ -13,20 +13,8 @@ net_useRandomKey "0" // Use a randomized netkey on launch.
net_processTimeBudget "0" // Net message process budget in milliseconds (removing netchannel if exceeded).
net_usesocketsforloopback "1" // Whether to use network sockets layer for packets.
//////////////////////////
//// FILESYSTEM ////
//////////////////////////
fs_warning_level_native "0" // Sets SDK file system warning level.
//////////////////////////
//// MATSYS ////
//////////////////////////
mat_showdxoutput "1" // Shows debug information from the DirectX hook system.
//////////////////////////
//// SQUIRREL ////
//////////////////////////
sq_showrsonloading "1" // Shows the global include files the SQVM is loading for loading scripts.
sq_showscriptloading "0" // Shows the script files the SQVM is loading for precompile job.
sq_showvmoutput "3" // Shows the VM output. 1 = Log to file. 2 = 1 + log to console. 3 = 1 + 2 + log to overhead console. 4 = only log to overhead console.
sq_showvmwarning "2" // Shows the VM warning output. 1 = Log to file. 2 = 1 + log to console.
script_show_output "2" // Shows the VM output.
script_show_warning "2" // Shows the VM warning output.

14
r5dev/squirrel/sqscript.cpp

@ -260,10 +260,7 @@ SQBool Script_DestroySignalEntryListHead(CSquirrelVM* s, HSQUIRRELVM v, SQFloat
//---------------------------------------------------------------------------------
SQInteger Script_LoadRson(const SQChar* rsonfile)
{
if (sq_showrsonloading->GetBool())
{
DevMsg(eDLL_T::ENGINE, "Loading RSON: '%s'\n", rsonfile);
}
DevMsg(eDLL_T::ENGINE, "Loading RSON: '%s'\n", rsonfile);
return v_Script_LoadRson(rsonfile);
}
@ -276,11 +273,6 @@ SQInteger Script_LoadRson(const SQChar* rsonfile)
//---------------------------------------------------------------------------------
SQBool Script_LoadScript(HSQUIRRELVM v, const SQChar* path, const SQChar* name, SQInteger flags)
{
if (sq_showscriptloading->GetBool())
{
DevMsg(eDLL_T::ENGINE, "Loading script: '%s'\n", name);
}
///////////////////////////////////////////////////////////////////////////////
return v_Script_LoadScript(v, path, name, flags);
}
@ -344,7 +336,7 @@ void VSquirrelVM::Attach() const
#endif // !DEDICATED
DetourAttach((LPVOID*)&v_Script_DestroySignalEntryListHead, &Script_DestroySignalEntryListHead);
DetourAttach((LPVOID*)&v_Script_LoadRson, &Script_LoadRson);
DetourAttach((LPVOID*)&v_Script_LoadScript, &Script_LoadScript);
//DetourAttach((LPVOID*)&v_Script_LoadScript, &Script_LoadScript);
}
//---------------------------------------------------------------------------------
void VSquirrelVM::Detach() const
@ -363,5 +355,5 @@ void VSquirrelVM::Detach() const
#endif // !DEDICATED
DetourDetach((LPVOID*)&v_Script_DestroySignalEntryListHead, &Script_DestroySignalEntryListHead);
DetourDetach((LPVOID*)&v_Script_LoadRson, &Script_LoadRson);
DetourDetach((LPVOID*)&v_Script_LoadScript, &Script_LoadScript);
//DetourDetach((LPVOID*)&v_Script_LoadScript, &Script_LoadScript);
}

4
r5dev/squirrel/sqvm.cpp

@ -75,7 +75,7 @@ SQRESULT SQVM_PrintFunc(HSQUIRRELVM v, SQChar* fmt, ...)
va_list args;
va_start(args, fmt);
CoreMsgV(type, static_cast<LogLevel_t>(sq_showvmoutput->GetInt()), remoteContext, "squirrel_re", fmt, args);
CoreMsgV(type, static_cast<LogLevel_t>(script_show_output->GetInt()), remoteContext, "squirrel_re", fmt, args);
va_end(args);
return SQ_OK;
@ -122,7 +122,7 @@ SQRESULT SQVM_WarningFunc(HSQUIRRELVM v, SQInteger a2, SQInteger a3, SQInteger*
}
std::string svConstructor(*ppString, *nStringSize); // Get string from memory via std::string constructor.
CoreMsg(LogType_t::SQ_WARNING, static_cast<LogLevel_t>(sq_showvmwarning->GetInt()),
CoreMsg(LogType_t::SQ_WARNING, static_cast<LogLevel_t>(script_show_warning->GetInt()),
remoteContext, NO_ERROR, "squirrel_re(warning)", "%s", svConstructor.c_str());
return result;

9
r5dev/tier1/IConVar.cpp

@ -200,7 +200,7 @@ void ConVar::Init(void)
#endif // !DEDICATED
//-------------------------------------------------------------------------
// FILESYSTEM |
fs_showWarnings = ConVar::Create("fs_showWarnings" , "0", FCVAR_DEVELOPMENTONLY, "Logs the FileSystem warnings to the console, filtered by 'fs_warning_level' ( !slower! ).", true, 0.f, true, 2.f, nullptr, "1 = log to console. 2 = 1 + log to notify.");
fs_showWarnings = ConVar::Create("fs_showWarnings" , "0", FCVAR_DEVELOPMENTONLY, "Logs the FileSystem warnings to the console, filtered by 'fs_warning_level' ( !slower! ).", true, 0.f, true, 2.f, nullptr, "0 = log to file. 1 = 0 + log to console. 2 = 1 + log to notify.");
fs_packedstore_entryblock_stats = ConVar::Create("fs_packedstore_entryblock_stats" , "0", FCVAR_DEVELOPMENTONLY, "Logs the stats of each file entry in the VPK during decompression ( !slower! ).", false, 0.f, false, 0.f, nullptr, nullptr);
fs_packedstore_workspace = ConVar::Create("fs_packedstore_workspace" , "platform/ship/", FCVAR_DEVELOPMENTONLY, "Determines the current VPK workspace.", false, 0.f, false, 0.f, nullptr, nullptr);
fs_packedstore_compression_level = ConVar::Create("fs_packedstore_compression_level", "default", FCVAR_DEVELOPMENTONLY, "Determines the VPK compression level.", false, 0.f, false, 0.f, nullptr, "fastest faster default better uber");
@ -208,15 +208,12 @@ void ConVar::Init(void)
//-------------------------------------------------------------------------
// MATERIALSYSTEM |
#ifndef DEDICATED
mat_showdxoutput = ConVar::Create("mat_showdxoutput", "0", FCVAR_DEVELOPMENTONLY | FCVAR_MATERIAL_SYSTEM_THREAD, "Shows debug output for the DirectX system.", false, 0.f, false, 0.f, nullptr, nullptr);
mat_alwaysComplain = ConVar::Create("mat_alwaysComplain", "0", FCVAR_RELEASE | FCVAR_MATERIAL_SYSTEM_THREAD, "Always complain when a material is missing.", false, 0.f, false, 0.f, nullptr, nullptr);
#endif // !DEDICATED
//-------------------------------------------------------------------------
// SQUIRREL |
sq_showrsonloading = ConVar::Create("sq_showrsonloading" , "0", FCVAR_DEVELOPMENTONLY, "Logs all RSON files loaded by the SQVM ( !slower! ).", false, 0.f, false, 0.f, nullptr, nullptr);
sq_showscriptloading = ConVar::Create("sq_showscriptloading", "0", FCVAR_DEVELOPMENTONLY, "Logs all scripts loaded by the SQVM to be pre-compiled ( !slower! ).", false, 0.f, false, 0.f, nullptr, nullptr);
sq_showvmoutput = ConVar::Create("sq_showvmoutput" , "0", FCVAR_RELEASE, "Prints the VM output to the console ( !slower! ).", true, 0.f, true, 2.f, nullptr, "1 = log to console. 2 = 1 + log to notify.");
sq_showvmwarning = ConVar::Create("sq_showvmwarning" , "0", FCVAR_RELEASE, "Prints the VM warning output to the console ( !slower! ).", true, 0.f, true, 2.f, nullptr, "1 = log to console. 2 = 1 + log to notify.");
script_show_output = ConVar::Create("script_show_output" , "0", FCVAR_RELEASE, "Prints the VM output to the console ( !slower! ).", true, 0.f, true, 2.f, nullptr, "0 = log to file. 1 = 0 + log to console. 2 = 1 + log to notify.");
script_show_warning = ConVar::Create("script_show_warning", "0", FCVAR_RELEASE, "Prints the VM warning output to the console ( !slower! ).", true, 0.f, true, 2.f, nullptr, "0 = log to file. 1 = 0 + log to console. 2 = 1 + log to notify.");
//-------------------------------------------------------------------------
// NETCHANNEL |
net_tracePayload = ConVar::Create("net_tracePayload" , "0", FCVAR_DEVELOPMENTONLY , "Log the payload of the send/recv datagram to a file on the disk.", false, 0.f, false, 0.f, nullptr, nullptr);

7
r5dev/tier1/cvar.cpp

@ -186,15 +186,12 @@ ConVar* fs_packedstore_max_helper_threads = nullptr;
//-----------------------------------------------------------------------------
// MATERIALSYSTEM |
#ifndef DEDICATED
ConVar* mat_showdxoutput = nullptr;
ConVar* mat_alwaysComplain = nullptr;
#endif // !DEDICATED
//-----------------------------------------------------------------------------
// SQUIRREL |
ConVar* sq_showrsonloading = nullptr;
ConVar* sq_showscriptloading = nullptr;
ConVar* sq_showvmoutput = nullptr;
ConVar* sq_showvmwarning = nullptr;
ConVar* script_show_output = nullptr;
ConVar* script_show_warning = nullptr;
//-----------------------------------------------------------------------------
// NETCHANNEL |
ConVar* net_tracePayload = nullptr;

7
r5dev/tier1/cvar.h

@ -182,15 +182,12 @@ extern ConVar* fs_packedstore_max_helper_threads;
//-------------------------------------------------------------------------
// MATERIALSYSTEM |
#ifndef DEDICATED
extern ConVar* mat_showdxoutput;
extern ConVar* mat_alwaysComplain;
#endif // !DEDICATED
//-------------------------------------------------------------------------
// SQUIRREL |
extern ConVar* sq_showrsonloading;
extern ConVar* sq_showscriptloading;
extern ConVar* sq_showvmoutput;
extern ConVar* sq_showvmwarning;
extern ConVar* script_show_output;
extern ConVar* script_show_warning;
//-------------------------------------------------------------------------
// NETCHANNEL |
extern ConVar* net_tracePayload;