Changeset 9869 in orxonox.OLD for trunk/src/world_entities/spawning_point.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/spawning_point.cc (modified) (9 diffs)

trunk/src/world_entities/spawning_point.cc

@@ -22 +22 @@
 #include "world_entity.h"
 
-#include "class_list.h"
-
 #include "compiler.h"
 
@@ -35 +33 @@
 #include "converter.h"
 
-CREATE_FACTORY( SpawningPoint, CL_SPAWNING_POINT );
-
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(SpawningPoint, CL_SPAWNING_POINT);
+CREATE_FACTORY( SpawningPoint);
 /**
  *  constructor
@@ -52 +51 @@
 void SpawningPoint::init()
 {
-  this->setClassID(CL_SPAWNING_POINT, "SpawningPoint");
+  this->registerObject(this, SpawningPoint::_objectList);
   PRINTF(0)("Created SpawningPoint\n");
 
@@ -84 +83 @@
   /* load teamId */
   LoadParam(root, "teamId", this, SpawningPoint, setTeamId)
-      .describe("sets teamId");
+  .describe("sets teamId");
 }
 
@@ -108 +107 @@
 void SpawningPoint::spawn(Playable* entity)
 {
-  const std::list<BaseObject*> * list = ClassList::getList( CL_PLAYABLE );
-
   bool found = false;
 
-  if ( !list )
-    return;
-
-  for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
+  for (ObjectList<Playable>::const_iterator it = Playable::objectList().begin();
+       it != Playable::objectList().end();
+       ++it)
   {
     if ( *it == entity )
@@ -162 +158 @@
       this->spawn(it->entity);
 
-      const std::list<BaseObject*> * list = ClassList::getList( CL_PLAYABLE );
-
       bool found = false;
 
-      if ( !list )
-        return;
-
-      for ( std::list<BaseObject*>::const_iterator it2 = list->begin(); it2 != list->end(); it2++ )
+      for (ObjectList<Playable>::const_iterator it2 = Playable::objectList().begin();
+           it2 != Playable::objectList().end();
+           ++it2)
       {
         if ( *it2 == it->entity )
@@ -202 +195 @@
  */
 void SpawningPoint::draw() const
-{
-}
+{}
 
 void SpawningPoint::sendRespawnMessage( int uniqueId )
@@ -243 +235 @@
   Playable      * playable = NULL;
 
-  const std::list<BaseObject*> * list = ClassList::getList( CL_SPAWNING_POINT );
-
-  if ( list )
-  {
-    for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
-    {
-      PRINTF(0)("%d:%d\n", dynamic_cast<SpawningPoint*>(*it)->getUniqueID(), spUniqueId);
-      if ( dynamic_cast<SpawningPoint*>(*it)->getUniqueID() == spUniqueId )
-      {
-        sp = dynamic_cast<SpawningPoint*>(*it);
-        break;
-      }
+  for (ObjectList<SpawningPoint>::const_iterator it = SpawningPoint::objectList().begin();
+       it != SpawningPoint::objectList().end();
+       ++it)
+  {
+    PRINTF(0)("%d:%d\n", (*it)->getUniqueID(), spUniqueId);
+    if ( (*it)->getUniqueID() == spUniqueId )
+    {
+      sp = (*it);
+      break;
     }
   }
@@ -264 +253 @@
   }
 
-  list = ClassList::getList( CL_PLAYABLE );
-
-  if ( list )
-  {
-    for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
-    {
-      if ( dynamic_cast<Playable*>(*it)->getUniqueID() == uniqueId )
-      {
-        playable = dynamic_cast<Playable*>(*it);
-        break;
-      }
+  for (ObjectList<Playable>::const_iterator it = Playable::objectList().begin();
+       it != Playable::objectList().end();
+       ++it)
+  {
+    if ( (*it)->getUniqueID() == uniqueId )
+    {
+      playable = (*it);
+      break;
     }
   }