Skip to content

Commit

Permalink
Do not check owner during stacking (bug OpenMW#1933)
Browse files Browse the repository at this point in the history
  • Loading branch information
akortunov committed Sep 25, 2018
1 parent 6ce6108 commit f4b4e00
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
0.45.0
------

Bug #1933: Actors can have few stocks of the same item
Bug #1990: Sunrise/sunset not set correct
Bug #2131: Lustidrike's spell misses the player every time
Bug #2222: Fatigue's effect on selling price is backwards
Expand Down
1 change: 0 additions & 1 deletion apps/openmw/mwworld/containerstore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@ bool MWWorld::ContainerStore::stacks(const ConstPtr& ptr1, const ConstPtr& ptr2)
}

return ptr1 != ptr2 // an item never stacks onto itself
&& ptr1.getCellRef().getOwner() == ptr2.getCellRef().getOwner()
&& ptr1.getCellRef().getSoul() == ptr2.getCellRef().getSoul()

&& ptr1.getClass().getRemainingUsageTime(ptr1) == ptr2.getClass().getRemainingUsageTime(ptr2)
Expand Down

0 comments on commit f4b4e00

Please sign in to comment.