Changeset 10345 in orxonox.OLD for branches/playability/src/world_entities/weapons

Timestamp:

Jan 24, 2007, 6:13:17 PM (18 years ago)

Author:

marcscha

Message:

SegFault prevention hack in fast factory

Location:

branches/playability/src/world_entities/weapons

Files:

• acid_launcher.cc (modified) (4 diffs)
• swarm_launcher.cc (modified) (1 diff)

branches/playability/src/world_entities/weapons/acid_launcher.cc

@@ -84 +84 @@
   animation2->setInfinity(ANIM_INF_CONSTANT);
 */
-  this->setStateDuration(WS_SHOOTING, .6);
+  this->setStateDuration(WS_SHOOTING, 1.0f);
+
   this->setStateDuration(WS_RELOADING, 1.0f);
   this->setStateDuration(WS_ACTIVATING, .4);
@@ -95 +96 @@
   this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
   this->setProjectileTypeC("AcidSplash");
-
 //   this->loadModel("models/guns/turret1.obj", 1.0);
 
   this->setEmissionPoint(2.0, 0, 0);
-  this->getProjectileFactory()->prepare(100);
+  this->getProjectileFactory()->prepare(10);
 
   this->setActionSound(WA_SHOOT, "sound/explosions/explosion_1.wav");
@@ -148 +148 @@
 
   Projectile* pj = NULL;
-  for( int i=0; i < 5; i++)
+  for( int i=0; i < 1; i++)
   {
       pj  = this->getProjectile();
@@ -155 +155 @@
 
       fired = true;
-      pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*115.0 + VECTOR_RAND(10)));
+      pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*165.0 + VECTOR_RAND(10)));
 
       pj->setParent(PNode::getNullParent());

branches/playability/src/world_entities/weapons/swarm_launcher.cc

@@ -150 +150 @@
   for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++)
   {
-    if( ((*eIterator)->getOMListNumber() == OM_GROUP_00) && ((*eIterator)->getClassCName() != "Weapon") && ((*eIterator)->getClassCName() != "Projectile") && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 300)
+    if( ((*eIterator)->getOMListNumber() != (this->getOMListNumber() -1)) && ((*eIterator)->getClassCName() != "Weapon") && ((*eIterator)->getClassCName() != "Projectile") && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 300)
     {
       pj  = this->getProjectile();