mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 06:35:30 +00:00
Code Issues Projects Releases Wiki Activity

minor cleanup and silenced a warning

Browse Source
This commit is contained in:
Marc Zinnschlag 2014-05-26 10:14:24 +02:00
parent f0d0a31a19
commit 4aab4bae65
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,7 +149,7 @@ namespace MWMechanics
bool AiCombat::execute (const MWWorld::Ptr& actor,float duration) bool AiCombat::execute (const MWWorld::Ptr& actor,float duration)
{ {
//General description //General description
if(actor.getClass().getCreatureStats(actor).isDead()) if(actor.getClass().getCreatureStats(actor).isDead())
return true; return true;
MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId); MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
@ -157,13 +157,16 @@ namespace MWMechanics
if(target.getClass().getCreatureStats(target).isDead()) if(target.getClass().getCreatureStats(target).isDead())
return true; return true;
if (!actor.getClass().isNpc() && target == MWBase::Environment::get().getWorld()->getPlayerPtr() && const MWWorld::Class& actorClass = actor.getClass();
(actor.getClass().canSwim(actor) && !actor.getClass().canWalk(actor) // pure water creature MWBase::World& world = *MWBase::Environment::get().getWorld();
&& !MWBase::Environment::get().getWorld()->isSwimming(target)) // Player moved out of water
|| (!actor.getClass().canSwim(actor) && MWBase::Environment::get().getWorld()->isSwimming(target))) // creature can't swim to Player if ((!actorClass.isNpc() && target == world.getPlayerPtr() &&
actorClass.canSwim(actor) && !actorClass.canWalk(actor) // pure water creature
&& !world.isSwimming(target)) // Player moved out of water
|| (!actorClass.canSwim(actor) && world.isSwimming(target))) // creature can't swim to Player
{ {
actor.getClass().getCreatureStats(actor).setHostile(false); actorClass.getCreatureStats(actor).setHostile(false);
actor.getClass().getCreatureStats(actor).setAttackingOrSpell(false); actorClass.getCreatureStats(actor).setAttackingOrSpell(false);
return true; return true;
} }
@ -360,9 +363,9 @@ namespace MWMechanics
if(distToTarget < rangeAttack || (distToTarget <= rangeFollow && mFollowTarget && !isStuck) ) if(distToTarget < rangeAttack || (distToTarget <= rangeFollow && mFollowTarget && !isStuck) )
{ {
//Melee and Close-up combat //Melee and Close-up combat
// if we preserve dir.z then horizontal angle can be inaccurate // if we preserve dir.z then horizontal angle can be inaccurate
mMovement.mRotation[2] = getZAngleToDir(Ogre::Vector3(vDirToTarget.x, vDirToTarget.y, 0)); mMovement.mRotation[2] = getZAngleToDir(Ogre::Vector3(vDirToTarget.x, vDirToTarget.y, 0));
// (not quite strike dist while following) // (not quite strike dist while following)
if (mFollowTarget && distToTarget > rangeAttack) if (mFollowTarget && distToTarget > rangeAttack)
@ -408,7 +411,7 @@ namespace MWMechanics
{ {
bool preferShortcut = false; bool preferShortcut = false;
bool inLOS = MWBase::Environment::get().getWorld()->getLOS(actor, target); bool inLOS = MWBase::Environment::get().getWorld()->getLOS(actor, target);
// check if shortcut is available // check if shortcut is available
if(inLOS && (!isStuck || mReadyToAttack) if(inLOS && (!isStuck || mReadyToAttack)
&& (!mForceNoShortcut || (Ogre::Vector3(mShortcutFailPos.pos) - vActorPos).length() >= PATHFIND_SHORTCUT_RETRY_DIST)) && (!mForceNoShortcut || (Ogre::Vector3(mShortcutFailPos.pos) - vActorPos).length() >= PATHFIND_SHORTCUT_RETRY_DIST))