From 94c5d6d2f9b6b1b07326493e240230b8c20805b8 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Mon, 24 Oct 2016 11:15:09 +0300 Subject: [PATCH] Don't use autoEquip on player-controlled NPCs --- apps/openmw/mwworld/inventorystore.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp index 98cbad742..6ee007936 100644 --- a/apps/openmw/mwworld/inventorystore.cpp +++ b/apps/openmw/mwworld/inventorystore.cpp @@ -232,6 +232,12 @@ bool MWWorld::InventoryStore::canActorAutoEquip(const MWWorld::Ptr& actor, const return false; } + // tes3mp needs player-controlled NPCs to wear whatever their players are + // actually wearing, so a condition has been added that should return + // false only for them + else if (!actor.getBase()->canChangeCell) + return false; + return true; }