From 3f1df4caa69d48b0dad31dee4a741e7c03e7dc1b Mon Sep 17 00:00:00 2001 From: scrawl Date: Tue, 24 May 2016 13:21:43 +0200 Subject: [PATCH] Don't auto-equip ammunition (Fixes #3401) --- apps/openmw/mwworld/inventorystore.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp index 318b7c5ec..08436b238 100644 --- a/apps/openmw/mwworld/inventorystore.cpp +++ b/apps/openmw/mwworld/inventorystore.cpp @@ -255,6 +255,9 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor) // Equipping weapons is handled by AiCombat. Anything else (lockpicks, probes) can't be used by NPCs anyway (yet) continue; + if (iter.getType() == MWWorld::ContainerStore::Type_Weapon) + continue; + if (slots_.at (*iter2)!=end()) { Ptr old = *slots_.at (*iter2);