Merge branch 'fix_restocking_remove' into 'master'

Fix Lua remove interacting with restocking items See merge request OpenMW/openmw!3615
OpenMW · Nov 29, 2023 · 76172c7 · 76172c7
2 parents 047db00 + 1841341
commit 76172c7
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
@@ -417,20 +417,23 @@ namespace MWLua
 
                 using DelayedRemovalFn = std::function<void(MWWorld::Ptr)>;
                 auto removeFn = [](const MWWorld::Ptr ptr, int countToRemove) -> std::optional<DelayedRemovalFn> {
-                    int currentCount = ptr.getRefData().getCount();
+                    int rawCount = ptr.getRefData().getCount(false);
+                    int currentCount = std::abs(rawCount);
+                    int signedCountToRemove = (rawCount < 0 ? -1 : 1) * countToRemove;
+
                     if (countToRemove <= 0 || countToRemove > currentCount)
                         throw std::runtime_error("Can't remove " + std::to_string(countToRemove) + " of "
                             + std::to_string(currentCount) + " items");
-                    ptr.getRefData().setCount(currentCount - countToRemove); // Immediately change count
+                    ptr.getRefData().setCount(rawCount - signedCountToRemove); // Immediately change count
                     if (!ptr.getContainerStore() && currentCount > countToRemove)
                         return std::nullopt;
                     // Delayed action to trigger side effects
-                    return [countToRemove](MWWorld::Ptr ptr) {
+                    return [signedCountToRemove](MWWorld::Ptr ptr) {
                         // Restore the original count
-                        ptr.getRefData().setCount(ptr.getRefData().getCount() + countToRemove);
+                        ptr.getRefData().setCount(ptr.getRefData().getCount(false) + signedCountToRemove);
                         // And now remove properly
                         if (ptr.getContainerStore())
-                            ptr.getContainerStore()->remove(ptr, countToRemove, false);
+                            ptr.getContainerStore()->remove(ptr, std::abs(signedCountToRemove), false);
                         else
                         {
                             MWBase::Environment::get().getWorld()->disable(ptr);