Merge pull request #968 from Allofich/AIActivate

Use namespace block in aiactivate

apps/openmw/mwmechanics/aiactivate.cpp

@@ -12,63 +12,67 @@
 #include "steering.hpp"
 #include "movement.hpp"
 
-MWMechanics::AiActivate::AiActivate(const std::string &objectId)
-    : mObjectId(objectId)
+namespace MWMechanics
 {
-}
-MWMechanics::AiActivate *MWMechanics::AiActivate::clone() const
-{
-    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
+    AiActivate::AiActivate(const std::string &objectId)
+        : mObjectId(objectId)
+    {
+    }
 
-    actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Nothing);
+    AiActivate *MWMechanics::AiActivate::clone() const
+    {
+        return new AiActivate(*this);
+    }
 
-    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
+    bool 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
 
-    //Set the target desition from the actor
-    ESM::Pathgrid::Point dest = target.getRefData().getPosition().pos;
+        actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Nothing);
 
-    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);
+        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
 
-        MWBase::Environment::get().getWorld()->activate(target, actor);
+        //Set the target desition from the actor
+        ESM::Pathgrid::Point dest = target.getRefData().getPosition().pos;
 
-        return true;
-    }
-    else {
-        pathTo(actor, dest, duration); //Go to the destination
-    }
+        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);
 
-    return false;
-}
+            MWBase::Environment::get().getWorld()->activate(target, actor);
 
-int MWMechanics::AiActivate::getTypeId() const
-{
-    return TypeIdActivate;
-}
+            return true;
+        }
+        else {
+            pathTo(actor, dest, duration); //Go to the destination
+        }
 
-void MWMechanics::AiActivate::writeState(ESM::AiSequence::AiSequence &sequence) const
-{
-    std::auto_ptr<ESM::AiSequence::AiActivate> activate(new ESM::AiSequence::AiActivate());
-    activate->mTargetId = mObjectId;
+        return false;
+    }
 
-    ESM::AiSequence::AiPackageContainer package;
-    package.mType = ESM::AiSequence::Ai_Activate;
-    package.mPackage = activate.release();
-    sequence.mPackages.push_back(package);
-}
+    int AiActivate::getTypeId() const
+    {
+        return TypeIdActivate;
+    }
 
-MWMechanics::AiActivate::AiActivate(const ESM::AiSequence::AiActivate *activate)
-    : mObjectId(activate->mTargetId)
-{
+    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)
+    {
+    }
 }