mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-19 22:53:53 +00:00
Code Issues Releases Wiki Activity

Remove redundant condition

Browse source 
apps/openmw/mwmechanics/character.cpp:500:14: warning: redundant condition 'isRealWeapon' [bugprone-redundant-branch-condition]
        else if (isRealWeapon)
             ^~~~~~~~~~~~~~~~~
This commit is contained in:
elsid 2022-07-06 12:45:03 +02:00
parent c38e342c99
commit f1ded70366
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -243,6 +243,13 @@ float getFallDamage(const MWWorld::Ptr& ptr, float fallHeight)
return 0.f; return 0.f;
} }
bool isRealWeapon(int weaponType)
{
return weaponType != ESM::Weapon::HandToHand
&& weaponType != ESM::Weapon::Spell
&& weaponType != ESM::Weapon::None;
}
} }
namespace MWMechanics namespace MWMechanics
@ -486,8 +493,7 @@ void CharacterController::onClose() const
std::string CharacterController::getWeaponAnimation(int weaponType) const std::string CharacterController::getWeaponAnimation(int weaponType) const
{ {
std::string weaponGroup = getWeaponType(weaponType)->mLongGroup; std::string weaponGroup = getWeaponType(weaponType)->mLongGroup;
bool isRealWeapon = weaponType != ESM::Weapon::HandToHand && weaponType != ESM::Weapon::Spell && weaponType != ESM::Weapon::None; if (isRealWeapon(weaponType) && !mAnimation->hasAnimation(weaponGroup))
if (isRealWeapon && !mAnimation->hasAnimation(weaponGroup))
{ {
static const std::string oneHandFallback = getWeaponType(ESM::Weapon::LongBladeOneHand)->mLongGroup; static const std::string oneHandFallback = getWeaponType(ESM::Weapon::LongBladeOneHand)->mLongGroup;
static const std::string twoHandFallback = getWeaponType(ESM::Weapon::LongBladeTwoHand)->mLongGroup; static const std::string twoHandFallback = getWeaponType(ESM::Weapon::LongBladeTwoHand)->mLongGroup;
@ -497,7 +503,7 @@ std::string CharacterController::getWeaponAnimation(int weaponType) const
// For real two-handed melee weapons use 2h swords animations as fallback, otherwise use the 1h ones // For real two-handed melee weapons use 2h swords animations as fallback, otherwise use the 1h ones
if (weapInfo->mFlags & ESM::WeaponType::TwoHanded && weapInfo->mWeaponClass == ESM::WeaponType::Melee) if (weapInfo->mFlags & ESM::WeaponType::TwoHanded && weapInfo->mWeaponClass == ESM::WeaponType::Melee)
weaponGroup = twoHandFallback; weaponGroup = twoHandFallback;
else if (isRealWeapon) else
weaponGroup = oneHandFallback; weaponGroup = oneHandFallback;
} }
else if (weaponType == ESM::Weapon::HandToHand && !mPtr.getClass().isBipedal(mPtr)) else if (weaponType == ESM::Weapon::HandToHand && !mPtr.getClass().isBipedal(mPtr))
@ -515,8 +521,7 @@ std::string CharacterController::getWeaponShortGroup(int weaponType) const
std::string CharacterController::fallbackShortWeaponGroup(const std::string& baseGroupName, MWRender::Animation::BlendMask* blendMask) const std::string CharacterController::fallbackShortWeaponGroup(const std::string& baseGroupName, MWRender::Animation::BlendMask* blendMask) const
{ {
bool isRealWeapon = mWeaponType != ESM::Weapon::HandToHand && mWeaponType != ESM::Weapon::Spell && mWeaponType != ESM::Weapon::None; if (!isRealWeapon(mWeaponType))
if (!isRealWeapon)
{ {
if (blendMask != nullptr) if (blendMask != nullptr)
*blendMask = MWRender::Animation::BlendMask_LowerBody; *blendMask = MWRender::Animation::BlendMask_LowerBody;