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

Add new cvar for logging missing materials

Browse Source 
The behavior has been changed; when a material is missing and bComplain is false, nothing gets printed to the console unless 'mat_alwaysComplain' is nonzero.
This commit is contained in:
Kawe Mazidjatari 2022-10-21 21:49:10 +02:00
parent bf9f758a98
commit 02fb1a3571
4 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
r5dev/materialsystem/cmaterialsystem.cpp
View File

@ -113,6 +113,28 @@ bool IsMaterialInternal(void** pCandidate)
return false;
}
#ifndef DEDICATED
//-----------------------------------------------------------------------------
// Purpose: finds a material
// Input : *pMatSys -
// *pMaterialName -
// nMaterialType -
// nUnk -
// bComplain -
// Output : pointer to material
//-----------------------------------------------------------------------------
CMaterialGlue* CMaterialSystem::FindMaterialEx(CMaterialSystem* pMatSys, const char* pMaterialName, uint8_t nMaterialType, int nUnk, bool bComplain)
{
CMaterialGlue* pMaterial = CMaterialSystem__FindMaterialEx(pMatSys, pMaterialName, nMaterialType, nUnk, bComplain);
if ((bComplain || mat_alwaysComplain->GetBool()) && pMaterial->IsErrorMaterial())
{
Error(eDLL_T::MS, NO_ERROR, "Material \"%s\" not found; replacing with \"%s\".\n", pMaterialName, pMaterial->GetName());
}
return pMaterial;
}
#endif // !DEDICATED
///////////////////////////////////////////////////////////////////////////////
void CMaterialSystem_Attach()
{

3
r5dev/tier1/IConVar.cpp
View File

@ -192,7 +192,8 @@ void ConVar::Init(void) const
//-------------------------------------------------------------------------
// MATERIALSYSTEM |
#ifndef DEDICATED
mat_showdxoutput = ConVar::Create("mat_showdxoutput", "0", FCVAR_DEVELOPMENTONLY, "Shows debug output for the DirectX system.", false, 0.f, false, 0.f, nullptr, nullptr);
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 |

1
r5dev/tier1/cvar.cpp
View File

@ -164,6 +164,7 @@ ConVar* fs_packedstore_compression_level = nullptr;
// MATERIALSYSTEM |
#ifndef DEDICATED
ConVar* mat_showdxoutput = nullptr;
ConVar* mat_alwaysComplain = nullptr;
#endif // !DEDICATED
//-----------------------------------------------------------------------------
// SQUIRREL |

1
r5dev/tier1/cvar.h
View File

@ -160,6 +160,7 @@ extern ConVar* fs_packedstore_compression_level;
// MATERIALSYSTEM |
#ifndef DEDICATED
extern ConVar* mat_showdxoutput;
extern ConVar* mat_alwaysComplain;
#endif // !DEDICATED
//-------------------------------------------------------------------------
// SQUIRREL |