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

Timestamp:

Jan 7, 2006, 11:07:22 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the branche network back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r 6351:HEAD
no conflicts

File:

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

trunk/src/world_entities/spawning_point.cc

@@ -16 +16 @@
 
 #include "spawning_point.h"
+
 #include "load_param.h"
 #include "factory.h"
+
 #include "compiler.h"
-#include "world.h" /* only temp. until the object manager is implemented*/
+
 
 /**
@@ -97 +99 @@
             this->frequency, this->seed);
   BaseObject* spawningEntity = Factory::fabricate(this->classID);
-  if( likely(this->world != NULL))
-    this->world->spawn(dynamic_cast<WorldEntity*>(spawningEntity));
+
+//   if( likely(this->world != NULL))
+//     this->world->spawn(dynamic_cast<WorldEntity*>(spawningEntity));
 }