Changeset 9656 in orxonox.OLD for trunk/src/world_entities/projectiles

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

Location:

trunk/src/world_entities/projectiles

Files:

• guided_missile.h (modified) (1 diff)
• laser.cc (modified) (1 diff)
• projectile.cc (modified) (1 diff)

trunk/src/world_entities/projectiles/guided_missile.h

@@ -13 +13 @@
 class ParticleEmitter;
 class FastFactory;
-class Aim;
 
 class GuidedMissile : public Projectile

trunk/src/world_entities/projectiles/laser.cc

@@ -88 +88 @@
   }
 
-  this->setDamage(0);
+  this->setDamage(20);
   this->setHealth(0);
 }

trunk/src/world_entities/projectiles/projectile.cc

@@ -45 +45 @@
   this->explosionBuffer = NULL;
   this->engineBuffer = NULL;
+
+  //this->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
 }