From d3effdf34c876268d262a31b4e09e542bfce6446 Mon Sep 17 00:00:00 2001 From: scrawl Date: Mon, 20 May 2013 13:32:38 +0200 Subject: [PATCH] Fix exception when trying to equip a shield while a lockpick is equipped --- apps/openmw/mwclass/armor.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp index 8e4c8f953..f8e4dc40a 100644 --- a/apps/openmw/mwclass/armor.cpp +++ b/apps/openmw/mwclass/armor.cpp @@ -341,13 +341,14 @@ namespace MWClass if(weapon == invStore.end()) return std::make_pair(1,""); - if(weapon->get()->mBase->mData.mType == ESM::Weapon::LongBladeTwoHand || + if(weapon->getTypeName() == typeid(ESM::Weapon).name() && + (weapon->get()->mBase->mData.mType == ESM::Weapon::LongBladeTwoHand || weapon->get()->mBase->mData.mType == ESM::Weapon::BluntTwoClose || weapon->get()->mBase->mData.mType == ESM::Weapon::BluntTwoWide || weapon->get()->mBase->mData.mType == ESM::Weapon::SpearTwoWide || weapon->get()->mBase->mData.mType == ESM::Weapon::AxeTwoHand || weapon->get()->mBase->mData.mType == ESM::Weapon::MarksmanBow || - weapon->get()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow) + weapon->get()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)) { return std::make_pair(3,""); }