Changeset 5826 for code/branches/core5

Timestamp:

Sep 28, 2009, 9:05:56 PM (15 years ago)

Author:

landauf

Message:

Using a WeakPtr instead of a PawnListener-callback in UnderAttack to observe the Destroyer
HUDHealthBar also uses a WeakPtr now (before it displayed the health of already destroyed pawns)

Location:

code/branches/core5/src

Files:

• modules/overlays/hud/HUDHealthBar.cc (modified) (1 diff)
• modules/overlays/hud/HUDHealthBar.h (modified) (1 diff)
• orxonox/gametypes/UnderAttack.cc (modified) (2 diffs)
• orxonox/gametypes/UnderAttack.h (modified) (2 diffs)

code/branches/core5/src/modules/overlays/hud/HUDHealthBar.cc

@@ -85 +85 @@
             this->textoverlay_->setCaption(multi_cast<std::string>(static_cast<int>(this->owner_->getHealth())));
         }
+        else
+        {
+            this->setValue(0);
+            this->textoverlay_->setCaption("0");
+        }
 
         if (this->bUseBarColour_)

code/branches/core5/src/modules/overlays/hud/HUDHealthBar.h

@@ -111 +111 @@
 
         private:
-            Pawn* owner_;
+            WeakPtr<Pawn> owner_;
             OverlayText* textoverlay_;
             bool bUseBarColour_;

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

@@ -46 +46 @@
         this->teams_ = 2;
         this->destroyer_ = 0;
+        this->destroyer_.addCallback(createFunctor(&UnderAttack::killedDestroyer)->setObject(this));
         this->gameEnded_ = false;
 
@@ -65 +66 @@
 
 
-    void UnderAttack::destroyedPawn(Pawn* pawn)
+    void UnderAttack::killedDestroyer()
     {
-        if (pawn == this->destroyer_)
+        this->end(); //end gametype
+        std::string message = "Ship destroyed! Team 0 has won!";
+        COUT(0) << message << std::endl;
+        Host::Broadcast(message);
+        this->gameEnded_ = true;
+
+        for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it)
         {
-            this->end(); //end gametype
-            std::string message = "Ship destroyed! Team 0 has won!";
-            COUT(0) << message << std::endl;
-            Host::Broadcast(message);
-            this->gameEnded_ = true;
+            if (it->first->getClientID() == CLIENTID_UNKNOWN)
+                continue;
 
-            for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it)
-            {
-                if (it->first->getClientID() == CLIENTID_UNKNOWN)
-                    continue;
-
-                if (it->second == 0)
-                    this->gtinfo_->sendAnnounceMessage("You have won the match!", it->first->getClientID());
-                else
-                    this->gtinfo_->sendAnnounceMessage("You have lost the match!", it->first->getClientID());
-            }
+            if (it->second == 0)
+                this->gtinfo_->sendAnnounceMessage("You have won the match!", it->first->getClientID());
+            else
+                this->gtinfo_->sendAnnounceMessage("You have lost the match!", it->first->getClientID());
         }
     }

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

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "interfaces/PawnListener.h"
 #include "TeamDeathmatch.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport UnderAttack : public TeamDeathmatch, public PawnListener
+    class _OrxonoxExport UnderAttack : public TeamDeathmatch
     {
         public:
@@ -54 +53 @@
 
         protected:
-            virtual void destroyedPawn(Pawn* pawn);
+            virtual void killedDestroyer();
 
-            Destroyer* destroyer_;
+            WeakPtr<Destroyer> destroyer_;
             unsigned int teams_;
             float gameTime_;