Changeset 2890 for code/trunk/src/orxonox/objects

Timestamp:

Apr 2, 2009, 8:42:11 PM (16 years ago)

Author:

landauf

Message:

• Added overlay element for the Pong Gametype
• Changed the type of the overlay's owner to BaseObject (former ControllableEntity) to allow other classes to own an overlay (for example a Gametype)
• OverlayGroup does now use a std::set instead of a std::map to store it's overlay elements. Therefore a name is not anymore compulsory for an overlay element.

Location:

code/trunk/src/orxonox/objects

Files:

• gametypes/Gametype.cc (modified) (1 diff)
• gametypes/Gametype.h (modified) (1 diff)
• gametypes/Pong.cc (modified) (2 diffs)
• gametypes/Pong.h (modified) (1 diff)
• infos/HumanPlayer.cc (modified) (2 diffs)

code/trunk/src/orxonox/objects/gametypes/Gametype.cc

@@ -229 +229 @@
         if (it != this->players_.end())
             it->second.frags_++;
+    }
+
+    int Gametype::getScore(PlayerInfo* player) const
+    {
+        std::map<PlayerInfo*, Player>::const_iterator it = this->players_.find(player);
+        if (it != this->players_.end())
+            return it->second.frags_;
+        else
+            return 0;
     }
 

code/trunk/src/orxonox/objects/gametypes/Gametype.h

@@ -107 +107 @@
                 { return this->players_; }
 
+            int getScore(PlayerInfo* player) const;
+
             inline void registerSpawnPoint(SpawnPoint* spawnpoint)
                 { this->spawnpoints_.insert(spawnpoint); }

code/trunk/src/orxonox/objects/gametypes/Pong.cc

@@ -53 +53 @@
         this->bat_[0] = 0;
         this->bat_[1] = 0;
+
+        this->setHUDTemplate("PongHUD");
 
         this->starttimer_.setTimer(1.0, false, this, createExecutor(createFunctor(&Pong::startBall)));
@@ -181 +183 @@
             this->ball_->setSpeed(this->center_->getBallSpeed());
     }
+
+    PlayerInfo* Pong::getLeftPlayer() const
+    {
+        if (this->bat_ && this->bat_[0])
+            return this->bat_[0]->getPlayer();
+        else
+            return 0;
+    }
+
+    PlayerInfo* Pong::getRightPlayer() const
+    {
+        if (this->bat_ && this->bat_[1])
+            return this->bat_[1]->getPlayer();
+        else
+            return 0;
+    }
 }

code/trunk/src/orxonox/objects/gametypes/Pong.h

@@ -53 +53 @@
                 { this->center_ = center; }
 
+            PlayerInfo* getLeftPlayer() const;
+            PlayerInfo* getRightPlayer() const;
+
         protected:
             void startBall();

code/trunk/src/orxonox/objects/infos/HumanPlayer.cc

@@ -173 +173 @@
         if (this->humanHud_)
             this->humanHud_->setOwner(this->getControllableEntity());
-
-        if (this->gametypeHud_)
-            this->gametypeHud_->setOwner(this->getControllableEntity());
     }
 
@@ -206 +203 @@
             this->gametypeHud_ = new OverlayGroup(this);
             this->gametypeHud_->addTemplate(this->gametypeHudTemplate_);
-            this->gametypeHud_->setOwner(this->getControllableEntity());
+            this->gametypeHud_->setOwner(this->getGametype());
         }
     }