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

Timestamp:

Jun 1, 2006, 2:28:16 PM (18 years ago)

Author:

patrick

Message:

trunk: merged the network branche back to trunk

File:

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

trunk/src/world_entities/spawning_point.h

@@ -9 +9 @@
 
 #include "world_entity.h"
+
+#include <map>
 
 class World;
@@ -43 +45 @@
 
     /**  sets the entity that is going to be spawned by this point @param classID: the id from the class_id.h file */
-    void SpawningPoint::setSpawningEntity(ClassID classID) { this->classID = classID; }
+    void SpawningPoint::setSpawningEntity(ClassID classid) { this->classid = classid; }
     /** sets the frequency with which the point is going to spawn entities (1/sec) @param frequency: the frequency */
     void SpawningPoint::setSpawningDelay(float delay) { this->delay = delay; }
@@ -49 +51 @@
     void SpawningPoint::setSpawningMode(int mode) { this->mode = (SpawningPointMode)mode; }
 
+    void pushEntity(WorldEntity* entity, float delay = 0);
 
     /** activates the spawning point */
-    void activate() { this->bSpawning = true; }
+    inline void activate() { this->bSpawning = true; }
     /** deactivates the spawning point */
-    void deactivate() { this->bSpawning = false; }
+    inline void deactivate() { this->bSpawning = false; }
+    inline bool isActive() const { return this->bSpawning; }
 
 
@@ -61 +65 @@
 
   private:
-    void spawn();
+    void spawn(WorldEntity* entity);
 
 
   private:
-    float                     delay;                          //!< the timer that counts down until the next spawn
-    float                     localTimer;                     //!< the local timer
-    float                     seed;                           //!< the random seed of the position
-    ClassID                   classID;                        //!< the classid of the entity to spawn
-    SpawningPointMode         mode;                           //!< the mode of the spawning point
-    ObjectManager::EntityList   queue;                          //!< queue of waiting WorldEntities to be spawned
-    bool                      bSpawning;                      //!< flag to indicate if this spawning point is active or not
+    float                           delay;                          //!< the timer that counts down until the next spawn
+    float                           localTimer;                     //!< the local timer
+    float                           seed;                           //!< the random seed of the position
+    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
+    bool                            bSpawning;                      //!< flag to indicate if this spawning point is active or not
 };