Changeset 2911 for code/trunk/src/orxonox/overlays/OverlayGroup.cc

Timestamp:

Apr 8, 2009, 2:58:40 AM (15 years ago)

Author:

landauf

Message:

Merged r1-2096 of questsystem5 back to trunk

I hope there weren't more "hidden merge changes" in r2909 than the one in OverlayGroup (removeElement) (and related to this the adjustments in NotificationQueue).

The corresponding media commit seems not yet to be done, but it doesn't break the build.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/overlays/OverlayGroup.cc (modified) (1 diff)

code/trunk/src/orxonox/overlays/OverlayGroup.cc

@@ -113 +113 @@
     }
 
+        /**
+    @brief
+        Removes an element from the map.
+    @param name
+        The name of the element that is removed.
+    @return
+        Returns true if there was such an element to remove, false if not.
+    */
+    bool OverlayGroup::removeElement(OrxonoxOverlay* element)
+    {
+        if(this->hudElements_.erase(element) == 0)
+            return false;
+        return true;
+    }
+
     //! Returns a different element as long as index < hudElements_.size().
     OrxonoxOverlay* OverlayGroup::getElement(unsigned int index)