teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge pull request #968 from Allofich/AIActivate

Browse source 
Use namespace block in aiactivate
This commit is contained in:
scrawl 2016-06-17 17:41:10 +02:00 committed by GitHub
commit 17a54b2a97
1 changed files with 60 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
apps/openmw/mwmechanics/aiactivate.cpp
View file

@ -12,63 +12,67 @@
#include "steering.hpp" #include "steering.hpp"
#include "movement.hpp" #include "movement.hpp"
MWMechanics::AiActivate::AiActivate(const std::string &objectId) namespace MWMechanics
: mObjectId(objectId)
{ {
} AiActivate::AiActivate(const std::string &objectId)
MWMechanics::AiActivate *MWMechanics::AiActivate::clone() const : mObjectId(objectId)
{ {
return new AiActivate(*this);
}
bool MWMechanics::AiActivate::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
{
ESM::Position pos = actor.getRefData().getPosition(); //position of the actor
const MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(mObjectId, false); //The target to follow
actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Nothing);
if(target == MWWorld::Ptr() ||
!target.getRefData().getCount() || !target.getRefData().isEnabled() // Really we should be checking whether the target is currently registered
// with the MechanicsManager
)
return true; //Target doesn't exist
//Set the target desition from the actor
ESM::Pathgrid::Point dest = target.getRefData().getPosition().pos;
if(distance(dest, pos.pos[0], pos.pos[1], pos.pos[2]) < 200) { //Stop when you get close
actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
MWWorld::Ptr target = MWBase::Environment::get().getWorld()->getPtr(mObjectId,false);
MWBase::Environment::get().getWorld()->activate(target, actor);
return true;
}
else {
pathTo(actor, dest, duration); //Go to the destination
} }
return false; AiActivate *MWMechanics::AiActivate::clone() const
} {
return new AiActivate(*this);
int MWMechanics::AiActivate::getTypeId() const }
{
return TypeIdActivate; bool AiActivate::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
} {
ESM::Position pos = actor.getRefData().getPosition(); //position of the actor
void MWMechanics::AiActivate::writeState(ESM::AiSequence::AiSequence &sequence) const const MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(mObjectId, false); //The target to follow
{
std::auto_ptr<ESM::AiSequence::AiActivate> activate(new ESM::AiSequence::AiActivate()); actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Nothing);
activate->mTargetId = mObjectId;
if(target == MWWorld::Ptr() ||
ESM::AiSequence::AiPackageContainer package; !target.getRefData().getCount() || !target.getRefData().isEnabled() // Really we should be checking whether the target is currently registered
package.mType = ESM::AiSequence::Ai_Activate; // with the MechanicsManager
package.mPackage = activate.release(); )
sequence.mPackages.push_back(package); return true; //Target doesn't exist
}
//Set the target desition from the actor
MWMechanics::AiActivate::AiActivate(const ESM::AiSequence::AiActivate *activate) ESM::Pathgrid::Point dest = target.getRefData().getPosition().pos;
: mObjectId(activate->mTargetId)
{ if(distance(dest, pos.pos[0], pos.pos[1], pos.pos[2]) < 200) { //Stop when you get close
actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
MWWorld::Ptr target = MWBase::Environment::get().getWorld()->getPtr(mObjectId,false);
MWBase::Environment::get().getWorld()->activate(target, actor);
return true;
}
else {
pathTo(actor, dest, duration); //Go to the destination
}
return false;
}
int AiActivate::getTypeId() const
{
return TypeIdActivate;
}
void AiActivate::writeState(ESM::AiSequence::AiSequence &sequence) const
{
std::auto_ptr<ESM::AiSequence::AiActivate> activate(new ESM::AiSequence::AiActivate());
activate->mTargetId = mObjectId;
ESM::AiSequence::AiPackageContainer package;
package.mType = ESM::AiSequence::Ai_Activate;
package.mPackage = activate.release();
sequence.mPackages.push_back(package);
}
AiActivate::AiActivate(const ESM::AiSequence::AiActivate *activate)
: mObjectId(activate->mTargetId)
{
}
} }