Changeset 6142 in orxonox.OLD for trunk/src/world_entities/npcs/npc.cc

Timestamp:

Dec 16, 2005, 7:13:57 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merge the ObjectManager to the trunk
merged with command:
svn merge -r6082:HEAD objectmanager/ ../trunk/

conflicts resolution was easy this time
but specially merged the world to network_world

File:

• trunk/src/world_entities/npcs/npc.cc (modified) (4 diffs)

trunk/src/world_entities/npcs/npc.cc

@@ -33 +33 @@
 {
   this->setClassID(CL_NPC, "NPC");
-
+  this->toList(OM_GROUP_00);
 }
 
@@ -50 +50 @@
       WorldEntity* powerUp = new TurretPowerUp();
       powerUp->setAbsCoor(this->getAbsCoor());
-      State::getWorldEntityList()->add(powerUp);
+//      powerUp->toList(OM_COMMON);
     }
     else if ((float)rand()/RAND_MAX < .3)
@@ -56 +56 @@
       WorldEntity* powerUp = new LaserPowerUp();
       powerUp->setAbsCoor(this->getAbsCoor());
-      State::getWorldEntityList()->add(powerUp);
+      powerUp->toList(OM_COMMON);
     }
-    State::getWorldEntityList()->remove(this);
+    this->toList(OM_DEAD);
     this->removeNode();
 
@@ -68 +68 @@
   {
     this->setVisibiliy(false);
-    State::getWorldEntityList()->remove(this);
+    this->toList(OM_DEAD);
     this->removeNode();
   }