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

Timestamp:

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

Author:

patrick

Message:

merged the network branche back to trunk

File:

• trunk/src/world_entities/spawning_point.h (modified) (3 diffs)

trunk/src/world_entities/spawning_point.h

@@ -8 +8 @@
 #define _SPAWNING_POINT
 
-#include "world_entity.h"
+#include "playable.h"
 
-#include <map>
+#include <list>
 
 class World;
 class TiXmlElement;
 
+struct QueueEntry
+{
+  float respawnTime;
+  WorldEntity * entity;
+  OM_LIST list;
+};
 
 //!< used to indicate what type of objects are spawned by this spawning point
@@ -50 +56 @@
     /** sets the spawning point mode @param mode: the mode */
     void SpawningPoint::setSpawningMode(int mode) { this->mode = (SpawningPointMode)mode; }
+    
+    inline int getTeamId(){ return this->teamId; }
+    inline void setTeamId( int teamId ){ this->teamId = teamId; }
 
     void pushEntity(WorldEntity* entity, float delay = 0);
@@ -72 +81 @@
     float                           localTimer;                     //!< the local timer
     float                           seed;                           //!< the random seed of the position
+    int                             teamId;                         //!< only spawn players of this team
     ClassID                         classid;                        //!< the classid of the entity to spawn
     SpawningPointMode               mode;                           //!< the mode of the spawning point
-    std::map<WorldEntity*, float>   queue;                          //!< queue of waiting WorldEntities to be spawned
+    std::list<QueueEntry>           queue;                          //!< queue of waiting WorldEntities to be spawned
     bool                            bSpawning;                      //!< flag to indicate if this spawning point is active or not
 };