games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Do not call visitablePos for non-visitable objects

Browse Source
This commit is contained in:
Tomasz Zieliński
2024-12-25 08:23:45 +01:00
parent 77a35f76f7
commit d631e3f604
4 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/rmg/RmgObject.cpp
View File

@@ -255,6 +255,14 @@ Object::Instance & Object::addInstance(CGObjectInstance & object, const int3 & p
return dInstances.back();
}
bool Object::isVisitable() const
{
return vstd::contains_if(dInstances, [](const Instance & instance)
{
return instance.object().isVisitable();
});
}
const int3 & Object::getPosition() const
{
return dPosition;
@@ -464,6 +472,12 @@ uint32_t rmg::Object::getValue() const
rmg::Area Object::Instance::getBorderAbove() const
{
if (!object().isVisitable())
{
// TODO: Non-visitable objects don't need this, but theoretically could return valid area
return rmg::Area();
}
int3 visitablePos = getVisitablePosition();
auto areaVisitable = rmg::Area({visitablePos});
auto borderAbove = areaVisitable.getBorderOutside();