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 #5295 from IvanSavenko/bugfixing

Browse Source 
[1.6.4] Bugfixing for recently reported issues
This commit is contained in:
Ivan Savenko
2025-01-21 15:50:02 +02:00
committed by GitHub
parent e26fe815e9 6b387e5d17
commit 2ee5f2df02
23 changed files with 135 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/mapObjects/CGTownInstance.cpp
View File

@@ -394,8 +394,18 @@ void CGTownInstance::initializeConfigurableBuildings(vstd::RNG & rand)
{
for(const auto & kvp : getTown()->buildings)
{
if(!kvp.second->rewardableObjectInfo.getParameters().isNull())
if(kvp.second->rewardableObjectInfo.getParameters().isNull())
continue;
try {
rewardableBuildings[kvp.first] = new TownRewardableBuildingInstance(this, kvp.second->bid, rand);
}
catch (std::runtime_error & e)
{
std::string buildingConfig = kvp.second->rewardableObjectInfo.getParameters().toCompactString();
std::replace(buildingConfig.begin(), buildingConfig.end(), '\n', ' ');
throw std::runtime_error("Failed to load rewardable building data for " + kvp.second->getJsonKey() + " Reason: " + e.what() + ", config was: " + buildingConfig);
}
}
}