mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
Simplify NKAI settings loading code
This commit is contained in:
parent
20f323d83c
commit
e8e4446886
@ -18,7 +18,7 @@
|
||||
#include "../../../lib/modding/CModHandler.h"
|
||||
#include "../../../lib/VCMI_Lib.h"
|
||||
#include "../../../lib/filesystem/Filesystem.h"
|
||||
#include "../../../lib/json/JsonNode.h"
|
||||
#include "../../../lib/json/JsonUtils.h"
|
||||
|
||||
namespace NKAI
|
||||
{
|
||||
@ -31,26 +31,7 @@ namespace NKAI
|
||||
allowObjectGraph(false),
|
||||
useTroopsFromGarrisons(false)
|
||||
{
|
||||
ResourcePath resource("config/ai/nkai/nkai-settings", EResType::JSON);
|
||||
|
||||
loadFromMod("core", resource);
|
||||
|
||||
for(const auto & modName : VLC->modh->getActiveMods())
|
||||
{
|
||||
if(CResourceHandler::get(modName)->existsResource(resource))
|
||||
loadFromMod(modName, resource);
|
||||
}
|
||||
}
|
||||
|
||||
void Settings::loadFromMod(const std::string & modName, const ResourcePath & resource)
|
||||
{
|
||||
if(!CResourceHandler::get(modName)->existsResource(resource))
|
||||
{
|
||||
logGlobal->error("Failed to load font %s from mod %s", resource.getName(), modName);
|
||||
return;
|
||||
}
|
||||
|
||||
JsonNode node(JsonPath::fromResource(resource), modName);
|
||||
JsonNode node = JsonUtils::assembleFromFiles("config/ai/nkai/nkai-settings");
|
||||
|
||||
if(node.Struct()["maxRoamingHeroes"].isNumber())
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user