mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-04 02:41:19 +00:00
Code Issues Projects Releases Wiki Activity

remove dynamic_cast to ActionPotion

Browse Source
This commit is contained in:
mrcheko 2016-09-20 23:00:00 +03:00
parent 48765f2ff2
commit 229cb4b386
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/mwmechanics/aicombat.cpp
View File

@ -229,8 +229,7 @@ namespace MWMechanics
osg::Vec3f vAimDir = MWBase::Environment::get().getWorld()->aimToTarget(actor, target);
float distToTarget = MWBase::Environment::get().getWorld()->getHitDistance(actor, target);
bool isPotion = (dynamic_cast<ActionPotion*>(currentAction.get()) != NULL);
storage.mReadyToAttack = (!isPotion && distToTarget <= rangeAttack);
storage.mReadyToAttack = (currentAction->isAttackingOrSpell() && distToTarget <= rangeAttack);
// can't fight if attacker can't go where target is. E.g. A fish can't attack person on land.
if (distToTarget > rangeAttack

2
apps/openmw/mwmechanics/aicombataction.hpp
View File

@ -19,6 +19,7 @@ namespace MWMechanics
virtual float getCombatRange (bool& isRanged) const = 0;
virtual float getActionCooldown() { return 0.f; }
virtual const ESM::Weapon* getWeapon() const { return NULL; };
virtual bool isAttackingOrSpell() const { return true; }
};
class ActionSpell : public Action
@ -53,6 +54,7 @@ namespace MWMechanics
/// Drinks the given potion.
virtual void prepare(const MWWorld::Ptr& actor);
virtual float getCombatRange (bool& isRanged) const;
virtual bool isAttackingOrSpell() const { return false; }
/// Since this action has no animation, apply a small cool down for using it
virtual float getActionCooldown() { return 1.f; }