mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-06-23 20:41:35 +00:00
Code Issues Releases Wiki Activity

Merge pull request #445 from OpenMW/master

Browse source 
Add OpenMW commits up to 6 Jun 2018
This commit is contained in:
David Cernat 2018-06-07 13:41:04 +03:00 committed by GitHub
commit 2942bf6455
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -87,6 +87,7 @@
Bug #4413: Moving with 0 strength uses all of your fatigue Bug #4413: Moving with 0 strength uses all of your fatigue
Bug #4420: Camera flickering when I open up and close menus while sneaking Bug #4420: Camera flickering when I open up and close menus while sneaking
Bug #4435: Item health is considered a signed integer Bug #4435: Item health is considered a signed integer
Bug #4441: Adding items to currently disabled weapon-wielding creatures crashes the game
Feature #1786: Round up encumbrance value in the encumbrance bar Feature #1786: Round up encumbrance value in the encumbrance bar
Feature #2694: Editor: rename "model" column to make its purpose clear Feature #2694: Editor: rename "model" column to make its purpose clear
Feature #3870: Editor: Terrain Texture Brush Button Feature #3870: Editor: Terrain Texture Brush Button

9
apps/openmw/mwrender/objects.cpp
View file

@ -123,11 +123,12 @@ bool Objects::removeObject (const MWWorld::Ptr& ptr)
mObjects.erase(iter); mObjects.erase(iter);
if (ptr.getClass().isNpc()) if (ptr.getClass().isActor())
{ {
MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr); if (ptr.getClass().hasInventoryStore(ptr))
store.setInvListener(NULL, ptr); ptr.getClass().getInventoryStore(ptr).setInvListener(NULL, ptr);
store.setContListener(NULL);
ptr.getClass().getContainerStore(ptr).setContListener(NULL);
} }
ptr.getRefData().getBaseNode()->getParent(0)->removeChild(ptr.getRefData().getBaseNode()); ptr.getRefData().getBaseNode()->getParent(0)->removeChild(ptr.getRefData().getBaseNode());