Changeset 2973 for code/trunk/src/orxonox/overlays/hud

Timestamp:

May 12, 2009, 9:24:58 PM (16 years ago)

Author:

landauf

Message:

changed type of gametype-HUD and default-HUD to PlayerInfo (instead of Gametype and ControllableEntity respectively). The owner of the Pawn-HUD remains Pawn.

Location:

code/trunk/src/orxonox/overlays/hud

Files:

• GametypeStatus.cc (modified) (3 diffs)
• GametypeStatus.h (modified) (1 diff)
• PongScore.cc (modified) (1 diff)

code/trunk/src/orxonox/overlays/hud/GametypeStatus.cc

@@ -58 +58 @@
         SUPER(GametypeStatus, tick, dt);
 
-        if (this->owner_ && this->owner_->getGametypeInfo() && this->owner_->getPlayer())
+        if (this->owner_ && this->owner_->getGametypeInfo() && this->owner_->getControllableEntity())
         {
             const GametypeInfo* gtinfo = this->owner_->getGametypeInfo();
-            PlayerInfo* pinfo = this->owner_->getPlayer();
+            ControllableEntity* ce = this->owner_->getControllableEntity();
 
             if (!gtinfo->hasStarted() && !gtinfo->isStartCountdownRunning())
             {
-                if (!pinfo->isReadyToSpawn())
+                if (!this->owner_->isReadyToSpawn())
                     this->setCaption("Press [Fire] to start the match");
                 else
@@ -74 +74 @@
                 if (gtinfo->isStartCountdownRunning())
                     this->setCaption(convertToString((int)ceil(gtinfo->getStartCountdown())));
-                else if (this->owner_->isA(Class(Spectator)))
+                else if (ce->isA(Class(Spectator)))
                     this->setCaption("Press [Fire] to respawn");
                 else
@@ -89 +89 @@
         SUPER(GametypeStatus, changedOwner);
 
-        this->owner_ = dynamic_cast<ControllableEntity*>(this->getOwner());
+        this->owner_ = dynamic_cast<PlayerInfo*>(this->getOwner());
     }
 }

code/trunk/src/orxonox/overlays/hud/GametypeStatus.h

@@ -47 +47 @@
 
         private:
-            ControllableEntity* owner_;
+            PlayerInfo* owner_;
     };
 }

code/trunk/src/orxonox/overlays/hud/PongScore.cc

@@ -135 +135 @@
         SUPER(PongScore, changedOwner);
 
-        this->owner_ = dynamic_cast<Pong*>(this->getOwner());
+        if (this->getOwner() && this->getOwner()->getGametype())
+            this->owner_ = dynamic_cast<Pong*>(this->getOwner()->getGametype());
+        else
+            this->owner_ = 0;
     }
 }