diff options
| author | Jan <sentrycraft123@gmail.com> | 2023-06-29 04:22:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-28 23:22:33 -0400 |
| commit | efd907105cf7906c78253631f75bf4fd83f769db (patch) | |
| tree | 0516853204106852adb06ee1d69a74e8994309a0 /NorthstarDLL/core/convar | |
| parent | b5c4e4e7ed81394070b05296ed087b6043d27667 (diff) | |
| download | NorthstarLauncher-efd907105cf7906c78253631f75bf4fd83f769db.tar.gz NorthstarLauncher-efd907105cf7906c78253631f75bf4fd83f769db.zip | |
Code cleanup (#478)v1.16.0-rc1v1.15.1-rc1v1.15.11.15.X
* turn implicit type casts into standard compliant explicit type casts
* correct includes and library names
* correct implicit use of std-namespaced functions
* turn incomplete virtual implementations into pure virtuals (this also follows what the Source SDK tier0 header does)
* define SqRecurseArgs ahead of implementation to fix templating problems
* switch out removed getentity with getthisentity
* fix calls to curl_easy_escape with wrong types
* replace winapi-specific function with std starts_with function
* format squirrel header
Diffstat (limited to 'NorthstarDLL/core/convar')
| -rw-r--r-- | NorthstarDLL/core/convar/concommand.cpp | 2 | ||||
| -rw-r--r-- | NorthstarDLL/core/convar/convar.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/NorthstarDLL/core/convar/concommand.cpp b/NorthstarDLL/core/convar/concommand.cpp index 82594f04..ce198159 100644 --- a/NorthstarDLL/core/convar/concommand.cpp +++ b/NorthstarDLL/core/convar/concommand.cpp @@ -151,5 +151,5 @@ ON_DLL_LOAD("engine.dll", ConCommand, (CModule module)) ConCommandConstructor = module.Offset(0x415F60).As<ConCommandConstructorType>(); AddMiscConCommands(); - g_pPluginCommunicationhandler->m_sEngineData.ConCommandConstructor = ConCommandConstructor; + g_pPluginCommunicationhandler->m_sEngineData.ConCommandConstructor = (void*)ConCommandConstructor; } diff --git a/NorthstarDLL/core/convar/convar.cpp b/NorthstarDLL/core/convar/convar.cpp index d4efc1a0..5069192e 100644 --- a/NorthstarDLL/core/convar/convar.cpp +++ b/NorthstarDLL/core/convar/convar.cpp @@ -40,10 +40,10 @@ ON_DLL_LOAD("engine.dll", ConVar, (CModule module)) R2::g_pCVarInterface = new SourceInterface<CCvar>("vstdlib.dll", "VEngineCvar007"); R2::g_pCVar = *R2::g_pCVarInterface; - g_pPluginCommunicationhandler->m_sEngineData.conVarMalloc = conVarMalloc; - g_pPluginCommunicationhandler->m_sEngineData.conVarRegister = conVarRegister; - g_pPluginCommunicationhandler->m_sEngineData.ConVar_Vtable = g_pConVar_Vtable; - g_pPluginCommunicationhandler->m_sEngineData.IConVar_Vtable = g_pIConVar_Vtable; + g_pPluginCommunicationhandler->m_sEngineData.conVarMalloc = (void*)conVarMalloc; + g_pPluginCommunicationhandler->m_sEngineData.conVarRegister = (void*)conVarRegister; + g_pPluginCommunicationhandler->m_sEngineData.ConVar_Vtable = (void*)g_pConVar_Vtable; + g_pPluginCommunicationhandler->m_sEngineData.IConVar_Vtable = (void*)g_pIConVar_Vtable; } //----------------------------------------------------------------------------- @@ -80,7 +80,7 @@ ConVar::ConVar( this->m_ConCommandBase.s_pConCommandBases = (ConCommandBase*)g_pIConVar_Vtable; conVarMalloc(&this->m_pMalloc, 0, 0); // Allocate new memory for ConVar. - conVarRegister(this, pszName, pszDefaultValue, nFlags, pszHelpString, bMin, fMin, bMax, fMax, pCallback); + conVarRegister(this, pszName, pszDefaultValue, nFlags, pszHelpString, bMin, fMin, bMax, fMax, (void*)pCallback); } //----------------------------------------------------------------------------- @@ -321,7 +321,7 @@ void ConVar::SetValue(const char* pszValue) { // Not a color, do the standard thing float flNewValue = (float)atof(pszValue); - if (!isfinite(flNewValue)) + if (!std::isfinite(flNewValue)) { spdlog::warn("Warning: ConVar '{}' = '{}' is infinite, clamping value.\n", GetBaseName(), pszValue); flNewValue = FLT_MAX; |