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

Merge pull request #4712 from IvanSavenko/detect_conflict

Browse Source 
Detection of potential conflicts between mods
This commit is contained in:
Ivan Savenko
2024-10-07 17:57:52 +03:00
committed by GitHub
parent 2a628994ea 66fdad145c
commit 2399a5a765
11 changed files with 1260 additions and 991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mapObjectConstructors/CRewardableConstructor.cpp
View File

@@ -14,6 +14,7 @@
#include "../mapObjects/CRewardableObject.h"
#include "../texts/CGeneralTextHandler.h"
#include "../IGameCallback.h"
#include "../CConfigHandler.h"
VCMI_LIB_NAMESPACE_BEGIN
@@ -25,7 +26,8 @@ void CRewardableConstructor::initTypeData(const JsonNode & config)
if (!config["name"].isNull())
VLC->generaltexth->registerString( config.getModScope(), getNameTextID(), config["name"]);
JsonUtils::validate(config, "vcmi:rewardable", getJsonKey());
if (settings["mods"]["validation"].String() != "off")
JsonUtils::validate(config, "vcmi:rewardable", getJsonKey());
}