← Back to branch summary

~openmw/openmw/openmw-packaging2

« back to all changes in this revision

Viewing changes to apps/openmw/mwmechanics/aiescort.cpp

  • Committer: Scott Howard
  • Date: 2016-04-16 07:00:56 UTC
  • Revision ID: showard@debian.org-20160416070056-v6l5thn424is72s4
Cron update. Git hash: 1f7a547

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/openmw/mwmechanics/aiescort.cpp
75
75
                return true;
76
76
        }
77
77
 
78
 
        if (!isWithinMaxRange(osg::Vec3f(mX, mY, mZ), actor.getRefData().getPosition().asVec3()))
79
 
            return false;
80
 
 
81
78
        if (!mCellId.empty() && mCellId != actor.getCell()->getCell()->getCellId().mWorldspace)
82
79
            return false; // Not in the correct cell, pause and rely on the player to go back through a teleport door
83
80
 
122
119
        return TypeIdEscort;
123
120
    }
124
121
 
125
 
    MWWorld::Ptr AiEscort::getTarget()
 
122
    MWWorld::Ptr AiEscort::getTarget() const
126
123
    {
127
124
        return MWBase::Environment::get().getWorld()->getPtr(mActorId, false);
128
125
    }