Changeset 2890 for code/trunk/src/orxonox/overlays/OrxonoxOverlay.h

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.

File:

• code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified) (3 diffs)

code/trunk/src/orxonox/overlays/OrxonoxOverlay.h

@@ -154 +154 @@
         virtual void changedVisibility();
 
-        inline void setOwner(ControllableEntity* owner)
+        inline void setOwner(BaseObject* owner)
         {
             if (this->owner_ != owner)
@@ -162 +162 @@
             }
         }
-        inline ControllableEntity* getOwner() const
+        inline BaseObject* getOwner() const
             { return this->owner_; }
         virtual void changedOwner() {}
@@ -206 +206 @@
             We could also use the ObjectList, but that doesn't guarantee XMLPort(.) was called and is slower. */
         static std::map<std::string, OrxonoxOverlay*> overlays_s;
-        ControllableEntity* owner_;
+        BaseObject* owner_;
         OverlayGroup* group_;
   };