Changeset 6093 in orxonox.OLD for branches/network/src/world_entities
- Timestamp:
- Dec 14, 2005, 1:10:45 AM (19 years ago)
- Location:
- branches/network/src/world_entities
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/network/src/world_entities/spawning_point.cc
r6088 r6093 17 17 #include "spawning_point.h" 18 18 #include "load_param.h" 19 19 #include "factory.h" 20 #include "compiler.h" 21 #include "world.h" /* only temp. until the object manager is implemented*/ 20 22 21 23 /** 22 24 * standard constructor 23 25 */ 24 SpawningPoint::SpawningPoint (const Vector& absCoordinate, const World* world) 25 : WorldEntity(absCoodrinate) 26 SpawningPoint::SpawningPoint (World* world, const Vector& absCoordinate) 26 27 { 27 28 this->world = world; … … 37 38 */ 38 39 SpawningPoint::SpawningPoint (const Vector& position, float frequency, 39 float seed, int classID, const World* world) 40 : WorldEntity(position) 40 float seed, ClassID classID, World* world) 41 41 { 42 42 this->frequency = frequency; … … 83 83 84 84 /* now load the seed */ 85 LoadParam(root, "classid", this, SpawningPoint, setSpawningEntity)85 /* LoadParam(root, "classid", this, SpawningPoint, setSpawningEntity) 86 86 .describe("sets the class id of the entity to spawn") 87 .defaultValues(1, CL_WORLD_ENTITY); 87 .defaultValues(1, CL_WORLD_ENTITY);*/ 88 88 } 89 89 … … 97 97 this->frequency, this->seed); 98 98 BaseObject* spawningEntity = Factory::fabricate(this->classID); 99 if( LIKELY(this->world != NULL))99 if( likely(this->world != NULL)) 100 100 this->world->spawn(dynamic_cast<WorldEntity*>(spawningEntity)); 101 101 } -
branches/network/src/world_entities/spawning_point.h
r6088 r6093 17 17 18 18 public: 19 SpawningPoint ( const Vector& absCoordinate = Vector(0.0, 0.0, 0.0), const World* world);20 SpawningPoint (const Vector& position, float frequency, float seed, int classID, constWorld* world);19 SpawningPoint (World* world, const Vector& absCoordinate = Vector(0.0, 0.0, 0.0)); 20 SpawningPoint (const Vector& position, float frequency, float seed, ClassID classID, World* world); 21 21 virtual ~SpawningPoint (); 22 22 void init(); … … 25 25 26 26 /** sets the entity that is going to be spawned by this point @param classID: the id from the class_id.h file */ 27 void SpawningPoint::setSpawningEntity( intclassID) { this->classID = classID; }27 void SpawningPoint::setSpawningEntity(ClassID classID) { this->classID = classID; } 28 28 /** sets the frequency with which the point is going to spawn entities (1/sec) @param frequency: the frequency */ 29 29 void SpawningPoint::setSpawningFrequency(float frequency) { this->frequency = frequency; } … … 40 40 float countDown; //!< the timer that counts down until the next spawn 41 41 float seed; //!< the random seed of the position 42 intclassID; //!< the classid of the entity to spawn43 42 ClassID classID; //!< the classid of the entity to spawn 43 World* world; //!< reference to the world it belongs to (or in the future: the object manager) 44 44 45 45 };
Note: See TracChangeset
for help on using the changeset viewer.