Changeset 5258 in orxonox.OLD for trunk/src

Timestamp:

Sep 25, 2005, 7:29:10 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: binding of the Sky is ok again. (parenting mode wasn't there anymore)

Location:

trunk/src

Files:

• story_entities/world.cc (modified) (1 diff)
• world_entities/npc.cc (modified) (1 diff)

trunk/src/story_entities/world.cc

@@ -386 +386 @@
 
   this->sky->setParent(this->localCamera);
+  this->sky->setParentMode(PNODE_MOVEMENT);
 
   // initialize debug coord system

trunk/src/world_entities/npc.cc

@@ -42 +42 @@
 {
   if (entity->isA(CL_PROJECTILE))
+  {
     PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getName(), entity->getName(), location.x, location.y, location.z);
-  this->applyForce(Vector(0,0,0)-location*1000);
-//  this->setVisibiliy(false);
-//  State::getWorldEntityList()->remove(this);
+    this->applyForce(Vector(0,0,0)-location*1000);
+  }
+  else if (entity->isA(CL_NPC))
+  {
+    this->setVisibiliy(false);
+   State::getWorldEntityList()->remove(this);
+  }
 }