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

Fixed moving activatable object being incorrectly activated.

Browse Source
This commit is contained in:
Thomas 2014-05-13 20:32:29 -04:00
parent 6d540c4e07
commit 203ef580cf
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@
namespace MWMechanics namespace MWMechanics
{ {
/// \brief Causes actor to walk to activatable object and activate it /// \brief Causes actor to walk to activatable object and activate it
/** Will actiavte when close to object or path grid complete **/ /** Will activate when close to object **/
class AiActivate : public AiPackage class AiActivate : public AiPackage
{ {
public: public:

8
apps/openmw/mwmechanics/aipackage.cpp
View File

@ -109,19 +109,15 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, ESM::Pathgrid::Po
// change the angle a bit, too // change the angle a bit, too
zTurn(actor, Ogre::Degree(mPathFinder.getZAngleToNext(pos.pos[0] + 1, pos.pos[1]))); zTurn(actor, Ogre::Degree(mPathFinder.getZAngleToNext(pos.pos[0] + 1, pos.pos[1])));
} }
/*else if(distance(start, mStuckPos.pos[0], mStuckPos.pos[1], mStuckPos.pos[2]) < 10) { //NPC hasn't moved much is half a second, he's stuck
actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
actor.getClass().getMovementSettings(actor).mPosition[0] = 1;
}*/
} }
else { else { //Not stuck, so reset things
mStuckTimer = 0; mStuckTimer = 0;
mStuckPos = pos; mStuckPos = pos;
mLastDoorChecked = NULL; //Resets it, in case he gets stuck behind the door again mLastDoorChecked = NULL; //Resets it, in case he gets stuck behind the door again
} }
} }
else { else {
actor.getClass().getMovementSettings(actor).mPosition[1] = 1; actor.getClass().getMovementSettings(actor).mPosition[1] = 1; //Just run forward the rest of the time
} }
zTurn(actor, Ogre::Degree(mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1]))); zTurn(actor, Ogre::Degree(mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1])));