Changeset 10109 in orxonox.OLD

Timestamp:

Dec 19, 2006, 11:14:27 PM (17 years ago)

Author:

nicolasc

Message:

bump

Location:

branches/playability/src/world_entities

Files:

• projectiles/hbolt.cc (modified) (1 diff)
• projectiles/swarm_projectile.cc (modified) (3 diffs)
• space_ships/space_ship.cc (modified) (2 diffs)
• weapons/heavy_blaster.cc (modified) (1 diff)
• weapons/light_blaster.cc (modified) (1 diff)
• weapons/medium_blaster.cc (modified) (1 diff)
• weapons/swarm_launcher.cc (modified) (1 diff)

branches/playability/src/world_entities/projectiles/hbolt.cc

@@ -117 +117 @@
 {
   printf("Collision with HBolt\n");
-  if (this->hitEntity != entity/* && entity->isA(CL_NPC)*/ || entity == this->target)
+  if (this->hitEntity != entity && entity->isA(CL_NPC) || entity == this->target)
     this->destroy( entity );
   this->hitEntity = entity;
   dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());
-//   this->deactivate();
+  this->deactivate();
 }
 

branches/playability/src/world_entities/projectiles/swarm_projectile.cc

@@ -137 +137 @@
   this->hitEntity = entity;
   dynamic_cast<SpaceShip*>(entity)->damage(this->getPhysDamage(),this->getElecDamage());
-  this->destroy(NULL);
+  this->destroy(this);
 }
 
@@ -243 +243 @@
   this->lastDir = this->curDir;
   this->curDir = this->velocity;
-  if( (this->getAbsCoor() - this->target->getAbsCoor()).len() < 1)   // FIXME  Temp fake workaround for collision :)
+  if( (this->getAbsCoor() - this->target->getAbsCoor()).len() < 3)   // FIXME  Temp fake workaround for collision :)
   {
     dynamic_cast<WorldEntity*>(target)->destroy( this);
@@ -256 +256 @@
 {
 
-  printf("THIS SHOULD WORK!\n");
+//   printf("THIS SHOULD WORK!\n");
 
   Projectile::destroy( killer );

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -376 +376 @@
   this->secWeaponMan.showCrosshair();
   this->toList( OM_GROUP_01 );
-  /*
+  
   for(ObjectList<PNode>::const_iterator it = this->getNodesChildren().begin(); it != this->getNodesChildren().end(); it++)
   {
     if( likely( dynamic_cast<Weapon*>(*it) != NULL))
       dynamic_cast<WorldEntity*>(*it)->toList( OM_GROUP_01);
-  }*/
+  }
   //dynamic_cast<Element2D*>(this->secWeaponMan.getFixedTarget())->setVisibility( true);
   //this->attachCamera();
@@ -391 +391 @@
   this->secWeaponMan.hideCrosshair();
   this->toList( OM_GROUP_00);
-  /*
+  
   for(ObjectList<PNode>::const_iterator it = this->getNodesChildren().begin(); it != this->getNodesChildren().end(); it++)
   {
     if( likely( dynamic_cast<Weapon*>(*it) != NULL))
       dynamic_cast<WorldEntity*>(*it)->toList( OM_GROUP_00);
-  }*/
+  }
   //dynamic_cast<Element2D*>(this->secWeaponMan.getFixedTarget())->setVisibility( false);
   //this->detachCamera();

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

@@ -101 +101 @@
   pj->setAbsCoor(this->getEmissionPoint());
   pj->setAbsDir(this->getAbsDir());
+  pj->toList(OM_GROUP_01_PROJ);
   pj->activate();
 }

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

@@ -98 +98 @@
   pj->setAbsCoor(this->getEmissionPoint());
   pj->setAbsDir(this->getAbsDir());
+  pj->toList(OM_GROUP_01_PROJ);
   pj->activate();
 }

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

@@ -100 +100 @@
   pj->setAbsCoor(this->getEmissionPoint());
   pj->setAbsDir(this->getAbsDir());
+  pj->toList(OM_GROUP_01_PROJ);
   pj->activate();
 }

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

@@ -163 +163 @@
       pj->setAbsDir(this->getAbsDir());
       dynamic_cast<SwarmProjectile*>(pj)->setTarget( (PNode*)(*eIterator) );
+      pj->toList(OM_GROUP_01_PROJ);
       pj->activate();
-
     }
   }