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

Timestamp:

Jul 5, 2006, 4:39:02 PM (19 years ago)

Author:

bensch

Message:

merged the presentation back

File:

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

trunk/src/world_entities/spawning_point.cc

@@ -57 +57 @@
   
   MessageManager::getInstance()->registerMessageHandler( MSGID_RESPAWN, respawnMessageHandler, NULL );
+  
+  this->setSynchronized( true );
 }
 
@@ -102 +104 @@
 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++ )
+  {
+    if ( *it == entity )
+    {
+      found = true;
+      break;
+    }
+  }
+  
+  if ( !found )
+    return;
+
   PRINTF(0)("Spawningpoint spawns Entity (%s)\n", entity->getClassName());
 
@@ -137 +158 @@
       this->spawn(it->entity);
       
-      if ( SharedNetworkData::getInstance()->isGameServer() )
+      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++ )
+      {
+        if ( *it2 == it->entity )
+        {
+          found = true;
+          break;
+        }
+      }
+  
+      if ( found && SharedNetworkData::getInstance()->isGameServer() )
         this->sendRespawnMessage( it->entity->getUniqueID() );
 
@@ -194 +231 @@
   assert( Converter::byteArrayToInt( data+INTSIZE, &uniqueId ) == INTSIZE );
   
+  PRINTF(0)("SPAWNMESSAGE %d\n", uniqueId);
+  
   SpawningPoint * sp = NULL;
   Playable      * playable = NULL;
@@ -203 +242 @@
     for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
     {
-      if ( dynamic_cast<SpawningPoint*>(*it)->getUniqueID() == uniqueId )
+      PRINTF(0)("%d:%d\n", dynamic_cast<SpawningPoint*>(*it)->getUniqueID(), spUniqueId);
+      if ( dynamic_cast<SpawningPoint*>(*it)->getUniqueID() == spUniqueId )
       {
         sp = dynamic_cast<SpawningPoint*>(*it);
@@ -213 +253 @@
   if ( !sp )
   {
-    PRINTF(2)("could not find spawning point\n");
+    PRINTF(0)("could not find spawning point\n");
     return false;
   }
@@ -233 +273 @@
   if ( !playable )
   {
-    PRINTF(2)("could not find playable\n");
+    PRINTF(0)("could not find playable\n");
     return false;
   }