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

Added better error reporting for unclear crashes

Browse Source
This commit is contained in:
Ivan Savenko
2025-01-19 12:39:22 +00:00
parent 711bbc684f
commit 82b81a7853
4 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/CPlayerInterface.cpp
View File

@@ -182,6 +182,9 @@ void CPlayerInterface::closeAllDialogs()
if(infoWindow && infoWindow->ID != QueryID::NONE) if(infoWindow && infoWindow->ID != QueryID::NONE)
break; break;
if (topWindow == nullptr)
throw std::runtime_error("Invalid or non-existing top window! Total windows: " + std::to_string(GH.windows().count()));
topWindow->close(); topWindow->close();
} }
} }

5
client/gui/CIntObject.cpp
View File

@@ -343,6 +343,9 @@ WindowBase::WindowBase(int used_, Point pos_)
void WindowBase::close() void WindowBase::close()
{ {
if(!GH.windows().isTopWindow(this)) if(!GH.windows().isTopWindow(this))
throw std::runtime_error("Only top interface can be closed"); {
auto topWindow = GH.windows().topWindow<IShowActivatable>().get();
throw std::runtime_error(std::string("Only top interface can be closed! Top window is ") + typeid(*this).name() + " but attempted to close " + typeid(*topWindow).name());
}
GH.windows().popWindows(1); GH.windows().popWindows(1);
} }

7
client/render/CAnimation.cpp
View File

@@ -211,11 +211,18 @@ void CAnimation::createFlippedGroup(const size_t sourceGroup, const size_t targe
} }
ImageLocator CAnimation::getImageLocator(size_t frame, size_t group) const ImageLocator CAnimation::getImageLocator(size_t frame, size_t group) const
{
try
{ {
const ImageLocator & locator = source.at(group).at(frame); const ImageLocator & locator = source.at(group).at(frame);
if (!locator.empty()) if (!locator.empty())
return locator; return locator;
}
catch (std::out_of_range &)
{
throw std::runtime_error("Frame " + std::to_string(frame) + " of group " + std::to_string(group) + " is missing from animation " + name.getOriginalName() );
}
return ImageLocator(name, frame, group); return ImageLocator(name, frame, group);
} }

9
lib/mapObjects/CGTownInstance.cpp
View File

@@ -394,9 +394,16 @@ void CGTownInstance::initializeConfigurableBuildings(vstd::RNG & rand)
{ {
for(const auto & kvp : getTown()->buildings) 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); rewardableBuildings[kvp.first] = new TownRewardableBuildingInstance(this, kvp.second->bid, rand);
} }
catch (std::runtime_error & e) {
throw std::runtime_error("Failed to load rewardable building data for " + kvp.second->getJsonKey() + " Reason: " + e.what());
}
}
} }
DamageRange CGTownInstance::getTowerDamageRange() const DamageRange CGTownInstance::getTowerDamageRange() const