teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Don't auto equip for dead actors

Browse source
This commit is contained in:
scrawl 2013-11-19 18:42:43 +01:00
parent f3ff2e4260
commit 8b095982e9
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwworld/inventorystore.cpp
View file

@ -81,7 +81,8 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::add(const Ptr& itemPtr,
// Auto-equip items if an armor/clothing item is added, but not for the player nor werewolves // Auto-equip items if an armor/clothing item is added, but not for the player nor werewolves
if ((actorPtr.getRefData().getHandle() != "player") if ((actorPtr.getRefData().getHandle() != "player")
&& !(MWWorld::Class::get(actorPtr).getNpcStats(actorPtr).isWerewolf())) && !(MWWorld::Class::get(actorPtr).getNpcStats(actorPtr).isWerewolf())
&& !actorPtr.getClass().getCreatureStats(actorPtr).isDead())
{ {
std::string type = itemPtr.getTypeName(); std::string type = itemPtr.getTypeName();
if ((type == typeid(ESM::Armor).name()) || (type == typeid(ESM::Clothing).name())) if ((type == typeid(ESM::Armor).name()) || (type == typeid(ESM::Clothing).name()))
@ -450,7 +451,8 @@ int MWWorld::InventoryStore::remove(const Ptr& item, int count, const Ptr& actor
&& !(MWWorld::Class::get(actor).getNpcStats(actor).isWerewolf())) && !(MWWorld::Class::get(actor).getNpcStats(actor).isWerewolf()))
{ {
std::string type = item.getTypeName(); std::string type = item.getTypeName();
if ((type == typeid(ESM::Armor).name()) || (type == typeid(ESM::Clothing).name())) if (((type == typeid(ESM::Armor).name()) || (type == typeid(ESM::Clothing).name()))
&& !actor.getClass().getCreatureStats(actor).isDead())
autoEquip(actor); autoEquip(actor);
} }