mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-20 00:11:34 +00:00
Code Issues Releases Wiki Activity

Further updateWeaponState cleanup

Browse source
This commit is contained in:
Alexei Kotov 2022-08-09 14:10:46 +03:00
parent ea78e904a9
commit 2e112847be
1 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
apps/openmw/mwmechanics/character.cpp
View file

@ -1323,7 +1323,6 @@ bool CharacterController::updateWeaponState()
mWeaponType = weaptype; mWeaponType = weaptype;
mCurrentWeapon = weapgroup; mCurrentWeapon = weapgroup;
} }
// Make sure that we disabled unequipping animation // Make sure that we disabled unequipping animation
@ -1393,17 +1392,14 @@ bool CharacterController::updateWeaponState()
spellCastResult = world->startSpellCast(mPtr); spellCastResult = world->startSpellCast(mPtr);
mCanCast = spellCastResult == MWWorld::SpellCastState::Success; mCanCast = spellCastResult == MWWorld::SpellCastState::Success;
if (spellid.empty()) if (spellid.empty() && cls.hasInventoryStore(mPtr))
{ {
if (cls.hasInventoryStore(mPtr)) MWWorld::InventoryStore& inv = cls.getInventoryStore(mPtr);
if (inv.getSelectedEnchantItem() != inv.end())
{ {
MWWorld::InventoryStore& inv = cls.getInventoryStore(mPtr); const MWWorld::Ptr& enchantItem = *inv.getSelectedEnchantItem();
if (inv.getSelectedEnchantItem() != inv.end()) spellid = enchantItem.getClass().getEnchantment(enchantItem);
{ isMagicItem = true;
const MWWorld::Ptr& enchantItem = *inv.getSelectedEnchantItem();
spellid = enchantItem.getClass().getEnchantment(enchantItem);
isMagicItem = true;
}
} }
} }
@ -1550,8 +1546,8 @@ bool CharacterController::updateWeaponState()
} }
} }
// else if (mPtr != getPlayer()) use mAttackType set by AiCombat // else if (mPtr != getPlayer()) use mAttackType set by AiCombat
startKey = mAttackType+" start"; startKey = mAttackType + ' ' + startKey;
stopKey = mAttackType+" min attack"; stopKey = mAttackType + " min attack";
} }
mAnimation->play(mCurrentWeapon, priorityWeapon, mAnimation->play(mCurrentWeapon, priorityWeapon,
@ -1580,18 +1576,6 @@ bool CharacterController::updateWeaponState()
if (!animPlaying) if (!animPlaying)
animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete); animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete);
if (isKnockedDown())
{
if (mUpperBodyState > UpperBodyState::WeaponEquipped)
{
mUpperBodyState = UpperBodyState::WeaponEquipped;
if (mWeaponType > ESM::Weapon::None)
mAnimation->showWeapons(true);
}
if (!mCurrentWeapon.empty())
mAnimation->disable(mCurrentWeapon);
}
if (mUpperBodyState == UpperBodyState::AttackWindUp) if (mUpperBodyState == UpperBodyState::AttackWindUp)
{ {
mAttackStrength = complete; mAttackStrength = complete;