From 5c2bc515fefe103d894283a8420d630ef3580ce3 Mon Sep 17 00:00:00 2001 From: Allofich Date: Sun, 4 Sep 2016 01:57:38 +0900 Subject: [PATCH] Remove overridden code in aicombat --- apps/openmw/mwmechanics/aicombat.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp index 2926bcb950..aa6bcdef01 100644 --- a/apps/openmw/mwmechanics/aicombat.cpp +++ b/apps/openmw/mwmechanics/aicombat.cpp @@ -682,18 +682,7 @@ std::string chooseBestAttack(const ESM::Weapon* weapon) { std::string attackType; - if (weapon == NULL) - { - //hand-to-hand deal equal damage for each type - float roll = Misc::Rng::rollClosedProbability(); - if(roll <= 0.333f) //side punch - attackType = "slash"; - else if(roll <= 0.666f) //forward punch - attackType = "thrust"; - else - attackType = "chop"; - } - else + if (weapon != NULL) { //the more damage attackType deals the more probability it has int slash = (weapon->mData.mSlash[0] + weapon->mData.mSlash[1])/2;