From 3bbde312b97eb9a635ac9812830ade1708796980 Mon Sep 17 00:00:00 2001 From: Allofich Date: Mon, 12 Sep 2016 19:54:06 +0900 Subject: [PATCH] Remove unneeded code --- apps/openmw/mwmechanics/aicombat.cpp | 2 +- apps/openmw/mwmechanics/aicombataction.cpp | 2 -- apps/openmw/mwmechanics/aicombataction.hpp | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp index e51502f84..5f5685bb0 100644 --- a/apps/openmw/mwmechanics/aicombat.cpp +++ b/apps/openmw/mwmechanics/aicombat.cpp @@ -330,7 +330,7 @@ namespace MWMechanics mCombatMove = true; } // dodge movements (for NPCs and bipedal creatures) - else if (isNpc || ((actor.get()->mBase->mFlags & ESM::Creature::Bipedal) != 0)) + else if (actor.getClass().isBipedal(actor)) { // get the range of the target's weapon float rangeAttackOfTarget = 0.f; diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp index 6dea53e98..094df1db3 100644 --- a/apps/openmw/mwmechanics/aicombataction.cpp +++ b/apps/openmw/mwmechanics/aicombataction.cpp @@ -462,8 +462,6 @@ namespace MWMechanics void ActionWeapon::prepare(const MWWorld::Ptr &actor) { - mIsNpc = actor.getClass().isNpc(); - if (actor.getClass().hasInventoryStore(actor)) { if (mWeapon.isEmpty()) diff --git a/apps/openmw/mwmechanics/aicombataction.hpp b/apps/openmw/mwmechanics/aicombataction.hpp index e4ce44346..c280d3c11 100644 --- a/apps/openmw/mwmechanics/aicombataction.hpp +++ b/apps/openmw/mwmechanics/aicombataction.hpp @@ -63,7 +63,6 @@ namespace MWMechanics private: MWWorld::Ptr mAmmunition; MWWorld::Ptr mWeapon; - bool mIsNpc; public: /// \a weapon may be empty for hand-to-hand combat