From 3cadb5918f6889e898e2ebdce25b69a61361fe51 Mon Sep 17 00:00:00 2001 From: scrawl Date: Fri, 17 May 2013 14:11:02 +0200 Subject: [PATCH 1/2] Fix containers showing random items from my commit earlier --- apps/openmw/mwgui/container.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp index 8820467ff..60cb186e2 100644 --- a/apps/openmw/mwgui/container.cpp +++ b/apps/openmw/mwgui/container.cpp @@ -201,7 +201,7 @@ namespace MWGui { mPtr = container; - if (!loot) + if (mPtr.getTypeName() == typeid(ESM::NPC).name() && !loot) { // we are stealing stuff MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer(); From d096b19307ccb3f64acd2f0e401c6bb1a10054c3 Mon Sep 17 00:00:00 2001 From: scrawl Date: Fri, 17 May 2013 14:11:19 +0200 Subject: [PATCH 2/2] Fix not being able to equip arrows/bolts --- apps/openmw/mwclass/weapon.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp index 2367a0d7f..cb394d089 100644 --- a/apps/openmw/mwclass/weapon.cpp +++ b/apps/openmw/mwclass/weapon.cpp @@ -404,8 +404,8 @@ namespace MWClass { return std::make_pair (2, ""); } - return std::make_pair (1, ""); } + return std::make_pair(1, ""); } return std::make_pair (0, ""); }