Changeset 5769 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Nov 24, 2005, 11:18:39 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: sync

Location:

trunk/src/world_entities/weapons

Files:

• aiming_turret.cc (modified) (1 diff)
• bomb.cc (modified) (3 diffs)
• guided_missile.cc (modified) (1 diff)
• laser.cc (modified) (1 diff)
• projectile.cc (modified) (1 diff)
• rocket.cc (modified) (2 diffs)
• test_bullet.cc (modified) (1 diff)

trunk/src/world_entities/weapons/aiming_turret.cc

@@ -91 +91 @@
   this->setMaximumEnergy(10000, 50);
   this->increaseEnergy(100000);
-  //this->minCharge = 2;
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET);

trunk/src/world_entities/weapons/bomb.cc

@@ -46 +46 @@
   this->energyMin = 1;
   this->energyMax = 1;
-  this->remove();
   this->lifeSpan = 15;
 
@@ -146 +145 @@
 void Bomb::collidesWith (WorldEntity* entity, const Vector& location)
 {
-        this->detonate();
+        this->detonate();
 }
 
@@ -168 +167 @@
   while(lm != NULL)
   {
-   
+
     lm = it->nextElement();
   }

trunk/src/world_entities/weapons/guided_missile.cc

@@ -48 +48 @@
   this->energyMin = 1;
   this->energyMax = 10;
-  this->remove();
   this->lifeSpan = 5;
   this->agility = 5;

trunk/src/world_entities/weapons/laser.cc

@@ -45 +45 @@
   this->energyMin = 1;
   this->energyMax = 10;
-  this->remove();
   this->lifeSpan = 1.0;
 

trunk/src/world_entities/weapons/projectile.cc

@@ -40 +40 @@
   this->target = NULL;
 
-  this->remove();
+  this->removeNode();
 }
 

trunk/src/world_entities/weapons/rocket.cc

@@ -46 +46 @@
   this->energyMin = 1;
   this->energyMax = 10;
-  this->remove();
   this->lifeSpan = 2;
 
@@ -116 +115 @@
   ParticleEngine::getInstance()->addConnection(this->emitter, Rocket::trailParticles);
 
-  this->update(0);
+  this->updateNode(0);
   this->emitter->setEmissionRate(45.0);
   this->emitter->setEmissionVelocity(0.0);

trunk/src/world_entities/weapons/test_bullet.cc

@@ -46 +46 @@
   this->energyMin = 1;
   this->energyMax = 10;
-  this->remove();
   this->lifeSpan = 2;