mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-29 22:20:33 +00:00
Code Issues Projects Releases Wiki Activity

Match best attack selection to original MW

Browse Source 
(Fixes #3721)
This commit is contained in:
Allofich 2017-01-11 22:09:26 +09:00
parent dc1f6cdada
commit c10585fb07
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,12 +70,14 @@ 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;
if (slash >= chop && slash >= thrust)
if (slash == chop && slash == thrust)
return "slash";
else if (chop >= slash && chop >= thrust)
return "chop";
else
else if (thrust >= chop && thrust >= slash)
return "thrust";
else if (slash >= chop && slash >= thrust)
return "slash";
else
return "chop";
}
// Converts a movement Run state to its equivalent Walk state.