|
|
@ -504,13 +504,8 @@ namespace MWMechanics
|
|
|
|
targetWeapon = *weaponSlot;
|
|
|
|
targetWeapon = *weaponSlot;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
std::shared_ptr<Action> targetWeaponAction(new ActionWeapon(targetWeapon));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool isRangedCombat = false;
|
|
|
|
bool isRangedCombat = false;
|
|
|
|
if (targetWeaponAction.get())
|
|
|
|
rangeAttackOfTarget = ActionWeapon(targetWeapon).getCombatRange(isRangedCombat);
|
|
|
|
{
|
|
|
|
|
|
|
|
rangeAttackOfTarget = targetWeaponAction->getCombatRange(isRangedCombat);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (mMovement.mPosition[0] || mMovement.mPosition[1])
|
|
|
|
if (mMovement.mPosition[0] || mMovement.mPosition[1])
|
|
|
|
{
|
|
|
|
{
|
|
|
|