AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-10 12:59:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ContainerCapacityCheck' into 'master'

Browse Source 
Fix precision issue with container capacity check

Closes #8606

See merge request OpenMW/openmw!4776
This commit is contained in:
psi29a 2025-07-23 09:31:38 +00:00
commit d401dd2441
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/openmw/mwgui/containeritemmodel.cpp
View File

@ -224,7 +224,7 @@ namespace MWGui
if (target.getType() != ESM::Container::sRecordId) if (target.getType() != ESM::Container::sRecordId)
return true; return true;
// check container organic flag // Check container organic flag
MWWorld::LiveCellRef<ESM::Container>* ref = target.get<ESM::Container>(); MWWorld::LiveCellRef<ESM::Container>* ref = target.get<ESM::Container>();
if (ref->mBase->mFlags & ESM::Container::Organic) if (ref->mBase->mFlags & ESM::Container::Organic)
{ {
@ -232,9 +232,18 @@ namespace MWGui
return false; return false;
} }
// check that we don't exceed container capacity // Check for container without capacity
float weight = item.getClass().getWeight(item) * count; float capacity = target.getClass().getCapacity(target);
if (target.getClass().getCapacity(target) < target.getClass().getEncumbrance(target) + weight) if (capacity <= 0.0f)
{
MWBase::Environment::get().getWindowManager()->messageBox("#{sContentsMessage3}");
return false;
}
// Check the container capacity plus one increment so the expected total weight can
// fit in the container with floating-point imprecision
float newEncumbrance = target.getClass().getEncumbrance(target) + (item.getClass().getWeight(item) * count);
if (std::nextafterf(capacity, std::numeric_limits<float>::max()) < newEncumbrance)
{ {
MWBase::Environment::get().getWindowManager()->messageBox("#{sContentsMessage3}"); MWBase::Environment::get().getWindowManager()->messageBox("#{sContentsMessage3}");
return false; return false;