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

Timestamp:

Apr 2, 2009, 8:42:11 PM (15 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.

File:

• code/trunk/src/orxonox/objects/infos/HumanPlayer.cc (modified) (2 diffs)

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());
         }
     }