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

Timestamp:

Jun 26, 2006, 4:46:25 PM (19 years ago)

Author:

patrick

Message:

merged the network branche back to trunk

File:

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

trunk/src/world_entities/spawning_point.cc

@@ -24 +24 @@
 #include "compiler.h"
 
-#include <map>
+#include "state.h"
+#include "game_rules.h"
 
 
@@ -59 +60 @@
 {
   this->setClassID(CL_SPAWNING_POINT, "SpawningPoint");
+  
+  this->teamId = -1;
 }
 
@@ -81 +84 @@
   LoadParam(root, "delay", this, SpawningPoint, setSpawningDelay)
       .describe("sets the delay of the spawning point");
+      
+  /* load teamId */
+  LoadParam(root, "teamId", this, SpawningPoint, setTeamId)
+      .describe("sets teamId");
 
 
@@ -101 +108 @@
 void SpawningPoint::pushEntity(WorldEntity* entity, float delay)
 {
-  this->queue[entity] = this->localTimer + delay;
+  QueueEntry qe;
+  qe.entity = entity;
+  qe.list = entity->getOMListNumber();
+  qe.respawnTime = this->localTimer + delay;
+  
+  queue.push_back( qe );
 }
 
@@ -113 +125 @@
 
 
-  //BaseObject* spawningEntity = Factory::fabricate(this->classID);
-  //   if( likely(this->world != NULL))
-  //     this->world->spawn(dynamic_cast<WorldEntity*>(spawningEntity));
+  entity->setAbsCoor( this->getAbsCoor() );
+  entity->setAbsDir( this->getAbsDir() );
+  
+  //TODO set camera (not smooth)
 }
 
@@ -129 +142 @@
   this->localTimer += dt;
 
-  std::map<WorldEntity*, float>::iterator it = this->queue.begin();
-  for( ; it != this->queue.end(); it++)
+  std::list<QueueEntry>::iterator it = this->queue.begin();
+  for( ; it != this->queue.end(); )
   {
-    //
-    if( it->second <= this->localTimer)
+    
+    if( it->respawnTime <= this->localTimer)
     {
       //spawn the player
-      this->spawn(it->first);
+      this->spawn(it->entity);
+      
+      it->entity->toList( it->list );
+      
+      if ( State::getGameRules() )
+      {
+        (State::getGameRules())->registerSpawn( it->entity );
+      }
+      
+      std::list<QueueEntry>::iterator delit = it;
+      it++;
+      
+      queue.erase( delit );
+      
+      continue;
     }
+    
+    it++;
   }