Merge remote-tracking branch 'scrawl/master'

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, "");
     }

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();