Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #345 from diamante0018/develop

Browse Source 
[VisionFile] Fix ill-defined loop
This commit is contained in:
Dss0 2022-07-01 00:06:02 +02:00 committed by GitHub
commit 22d57a675e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Components/Modules/VisionFile.cpp
View File

@ -9,22 +9,14 @@ namespace Components
void VisionFile::ApplyExemptDvar(const std::string& dvarName, const char* buffer, const std::string& fileName) void VisionFile::ApplyExemptDvar(const std::string& dvarName, const char* buffer, const std::string& fileName)
{ {
for (std::size_t i = 0; i < std::extent_v<decltype(DvarExceptions)>; ++i) for (std::size_t i = 0; i < ARRAYSIZE(DvarExceptions); ++i)
{ {
if (dvarName == DvarExceptions[i]) if (dvarName == DvarExceptions[i])
{ {
const auto* dvar = Game::Dvar_FindVar(dvarName.data()); const auto* dvar = Game::Dvar_FindVar(dvarName.data());
assert(dvar != nullptr);
const auto* currentVal = Game::Dvar_DisplayableValue(dvar);
const auto* parsedValue = Game::Com_ParseOnLine(&buffer); const auto* parsedValue = Game::Com_ParseOnLine(&buffer);
if (std::strcmp(parsedValue, currentVal) == 0) assert(dvar != nullptr);
{
// The dvar is already set to the value we want
return;
}
Game::Dvar_SetFromStringFromSource(dvar, parsedValue, Game::DvarSetSource::DVAR_SOURCE_INTERNAL); Game::Dvar_SetFromStringFromSource(dvar, parsedValue, Game::DvarSetSource::DVAR_SOURCE_INTERNAL);
Logger::Print("Overriding '{}' from '{}'\n", dvarName, fileName); Logger::Print("Overriding '{}' from '{}'\n", dvarName, fileName);