games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Replaced vector of strings with simple bool for flag

Browse Source
This commit is contained in:
Ivan Savenko
2024-02-13 15:20:08 +02:00
parent 922966dcf8
commit d1c274f93f
6 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/json/JsonUtils.cpp
View File

@@ -223,7 +223,7 @@ void JsonUtils::merge(JsonNode & dest, JsonNode & source, bool ignoreOverride, b
}
case JsonNode::JsonType::DATA_STRUCT:
{
if(!ignoreOverride && vstd::contains(source.flags, "override"))
if(!ignoreOverride && source.getOverrideFlag())
{
std::swap(dest, source);
}