Changeset 5861

Timestamp:

Oct 2, 2009, 8:58:27 PM (15 years ago)

Author:

landauf

Message:

un-PawnListener-ized ArtificialController

Location:

code/branches/core5/src

Files:

• libraries/core/WeakPtr.h (modified) (1 diff)
• orxonox/controllers/ArtificialController.cc (modified) (2 diffs)
• orxonox/controllers/ArtificialController.h (modified) (2 diffs)
• orxonox/gametypes/UnderAttack.cc (modified) (1 diff)
• orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified) (2 diffs)

code/branches/core5/src/libraries/core/WeakPtr.h

@@ -168 +168 @@
             }
             
-            inline void addCallback(Functor* callback)
+            inline void setCallback(Functor* callback)
             {
                 this->callback_ = callback;

code/branches/core5/src/orxonox/controllers/ArtificialController.cc

@@ -46 +46 @@
         this->bHasTargetPosition_ = false;
         this->targetPosition_ = Vector3::ZERO;
+        
+        this->target_.setCallback(createFunctor(&ArtificialController::targetDied, this));
     }
 
@@ -162 +164 @@
     }
 
-    void ArtificialController::destroyedPawn(Pawn* ship)
-    {
-        if (ship == this->target_)
-        {
-            this->forgetTarget();
-            this->searchRandomTargetPosition();
-        }
+    void ArtificialController::abandonTarget(Pawn* target)
+    {
+        if (target == this->target_)
+            this->targetDied();
+    }
+
+    void ArtificialController::targetDied()
+    {
+        this->forgetTarget();
+        this->searchRandomTargetPosition();
     }
 

code/branches/core5/src/orxonox/controllers/ArtificialController.h

@@ -33 +33 @@
 
 #include "util/Math.h"
-#include "interfaces/PawnListener.h"
 #include "Controller.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport ArtificialController : public Controller, public PawnListener
+    class _OrxonoxExport ArtificialController : public Controller
     {
         public:
             ArtificialController(BaseObject* creator);
             virtual ~ArtificialController();
-
-            virtual void destroyedPawn(Pawn* pawn);
+            
+            void abandonTarget(Pawn* target);
 
         protected:
+            void targetDied();
+
             void moveToPosition(const Vector3& target);
             void moveToTargetPosition();
@@ -65 +66 @@
             bool bHasTargetPosition_;
             Vector3 targetPosition_;
-            Pawn* target_;
+            WeakPtr<Pawn> target_;
             bool bShooting_;
 

code/branches/core5/src/orxonox/gametypes/UnderAttack.cc

@@ -46 +46 @@
         this->teams_ = 2;
         this->destroyer_ = 0;
-        this->destroyer_.addCallback(createFunctor(&UnderAttack::killedDestroyer, this));
+        this->destroyer_.setCallback(createFunctor(&UnderAttack::killedDestroyer, this));
         this->gameEnded_ = false;
 

code/branches/core5/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc

@@ -31 +31 @@
 
 #include "core/CoreIncludes.h"
-#include "interfaces/PawnListener.h"
+#include "controllers/ArtificialController.h"
 #include "interfaces/TeamColourable.h"
 #include "gametypes/TeamBaseMatch.h"
@@ -92 +92 @@
 
         // Call this so bots stop shooting at the base after they converted it
-        for (ObjectList<PawnListener>::iterator it = ObjectList<PawnListener>::begin(); it != ObjectList<PawnListener>::end(); ++it)
-            it->destroyedPawn(this);
+        for (ObjectList<ArtificialController>::iterator it = ObjectList<ArtificialController>::begin(); it != ObjectList<ArtificialController>::end(); ++it)
+            it->abandonTarget(this);
     }
 }