Changeset 5794 in orxonox.OLD for branches/world_entities/src/util

Timestamp:

Nov 27, 2005, 3:50:20 PM (19 years ago)

Author:

bensch

Message:

we: sync

Location:

branches/world_entities/src/util

Files:

• object_manager.cc (modified) (3 diffs)
• object_manager.h (modified) (1 diff)

branches/world_entities/src/util/object_manager.cc

@@ -53 +53 @@
  * returns a new List with a list of WorldEntities of distance Radius from center
  */
-const std::list<WorldEntity*>* ObjectManager::distanceFromObject(const PNode& center, float radius, ClassID classID)
+std::list<WorldEntity*>* ObjectManager::distanceFromObject(const PNode& center, float radius, ClassID classID)
 {
   const tList<BaseObject>* objectList = ClassList::getList(classID);
@@ -61 +61 @@
 
     tIterator<BaseObject>* iter = objectList->getIterator();
-    PNode* tmp = dynamic_cast<PNode*>(iter->firstElement());
+    WorldEntity* tmp = dynamic_cast<WorldEntity*>(iter->firstElement());
     while (tmp != NULL)
     {
@@ -67 +67 @@
         newList->push_back(dynamic_cast<WorldEntity*>(tmp));
 
-      tmp = dynamic_cast<PNode*>(iter->nextElement());
+      tmp = dynamic_cast<WorldEntity*>(iter->nextElement());
     }
     delete iter;

branches/world_entities/src/util/object_manager.h

@@ -31 +31 @@
 
 
-  const std::list<WorldEntity*>* distanceFromObject(const PNode& center, float radius, ClassID classID);
+  static std::list<WorldEntity*>* distanceFromObject(const PNode& center, float radius, ClassID classID);
 
   ObjectGroupList* getGroupList( );