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

prevent crash when a mod from save file doesn't exist

Browse Source
This commit is contained in:
Andrey Filipenkov 2022-09-11 11:44:26 +03:00 committed by Andrii Danylchenko
parent e6e7679a2c
commit cedc9a92ed
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/CHeroHandler.cpp
View File

@ -842,10 +842,22 @@ void CHeroHandler::loadObstacles()
allConfigs.insert(allConfigs.begin(), "core"); allConfigs.insert(allConfigs.begin(), "core");
for(auto & mod : allConfigs) for(auto & mod : allConfigs)
{ {
if(!CResourceHandler::get(mod)->existsResource(ResourceID("config/obstacles.json"))) ISimpleResourceLoader * modResourceLoader;
try
{
modResourceLoader = CResourceHandler::get(mod);
}
catch(const std::out_of_range &)
{
logMod->warn("Mod '%1%' doesn't exist! Its obstacles won't be loaded!", mod);
continue;
}
const ResourceID obstaclesResource{"config/obstacles.json"};
if(!modResourceLoader->existsResource(obstaclesResource))
continue; continue;
const JsonNode config(mod, ResourceID("config/obstacles.json")); const JsonNode config(mod, obstaclesResource);
loadObstacles(config["obstacles"], false, obstacles); loadObstacles(config["obstacles"], false, obstacles);
loadObstacles(config["absoluteObstacles"], true, absoluteObstacles); loadObstacles(config["absoluteObstacles"], true, absoluteObstacles);
} }