From 4b9a888d7453d607cb463683697ab76d8400a840 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Fri, 17 May 2013 01:46:51 -0700 Subject: [PATCH] Use the PickProbe animation group as appropriate --- apps/openmw/mwmechanics/character.cpp | 3 ++- apps/openmw/mwmechanics/character.hpp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp index 587c49704..75a68aee0 100644 --- a/apps/openmw/mwmechanics/character.cpp +++ b/apps/openmw/mwmechanics/character.cpp @@ -119,6 +119,7 @@ static const struct WeaponInfo { { WeapType_BowAndArrow, "1h", "1h", "bowandarrow" }, { WeapType_Crossbow, "crossbow", "1h", "crossbow" }, { WeapType_ThowWeapon, "1h", "1h", "throwweapon" }, + { WeapType_PickProbe, "1h", "1h", "pickprobe" }, { WeapType_Spell, "spell", "", "spellcast" }, }; static const WeaponInfo *sWeaponTypeListEnd = &sWeaponTypeList[sizeof(sWeaponTypeList)/sizeof(sWeaponTypeList[0])]; @@ -366,7 +367,7 @@ void CharacterController::update(float duration, Movement &movement) { const std::string &type = weapon->getTypeName(); if(type == typeid(ESM::Lockpick).name() || type == typeid(ESM::Probe).name()) - weaptype = WeapType_OneHand; + weaptype = WeapType_PickProbe; else if(type == typeid(ESM::Weapon).name()) { MWWorld::LiveCellRef *ref = weapon->get(); diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp index c71172992..49df43d99 100644 --- a/apps/openmw/mwmechanics/character.hpp +++ b/apps/openmw/mwmechanics/character.hpp @@ -86,6 +86,7 @@ enum WeaponType { WeapType_BowAndArrow, WeapType_Crossbow, WeapType_ThowWeapon, + WeapType_PickProbe, WeapType_Spell };