mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 06:35:30 +00:00
Code Issues Projects Releases Wiki Activity

Use the PickProbe animation group as appropriate

Browse Source
This commit is contained in:
Chris Robinson 2013-05-17 01:46:51 -07:00
parent 6201cb0093
commit 4b9a888d74
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/mwmechanics/character.cpp
View File

@ -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<ESM::Weapon> *ref = weapon->get<ESM::Weapon>();

1
apps/openmw/mwmechanics/character.hpp
View File

@ -86,6 +86,7 @@ enum WeaponType {
WeapType_BowAndArrow,
WeapType_Crossbow,
WeapType_ThowWeapon,
WeapType_PickProbe,
WeapType_Spell
};