Merge branch 'always-use-best-attack-rounding-fix' into 'master'

Fix always-use-best-attack rounding See merge request OpenMW/openmw!1647
3 years ago · 380823d0ee
parent c1cd3ba9a1 6cd12823e8
commit 380823d0ee
1 changed files with 3 additions and 3 deletions
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@ -55,9 +55,9 @@ namespace

 std::string getBestAttack (const ESM::Weapon* weapon)
 {
-    int slash = (weapon->mData.mSlash[0] + weapon->mData.mSlash[1])/2;
-    int chop = (weapon->mData.mChop[0] + weapon->mData.mChop[1])/2;
-    int thrust = (weapon->mData.mThrust[0] + weapon->mData.mThrust[1])/2;
+    int slash = weapon->mData.mSlash[0] + weapon->mData.mSlash[1];
+    int chop = weapon->mData.mChop[0] + weapon->mData.mChop[1];
+    int thrust = weapon->mData.mThrust[0] + weapon->mData.mThrust[1];
    if (slash == chop && slash == thrust)
        return "slash";
    else if (thrust >= chop && thrust >= slash)