Changeset 10737 in orxonox.OLD for branches/presentation/src/world_entities/projectiles/hbolt.cc

Timestamp:

Jun 20, 2007, 6:17:06 PM (17 years ago)

Author:

nicolasc

Message:

collision fix

File:

• branches/presentation/src/world_entities/projectiles/hbolt.cc (modified) (3 diffs)

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

@@ -20 +20 @@
 #include "state.h"
 #include "model.h"
+
+#include "world_entities/npcs/actionbox_enemy.h"
 #include "world_entities/npcs/npc.h"
 
@@ -125 +127 @@
 {
   printf("Collision with HBolt\n");
-  if (this->hitEntity != entity && entity->isA(NPC::staticClassID()) || entity == this->target)
+  if (this->hitEntity != entity/* && entity->isA(NPC::staticClassID())*/ && entity->isA(ActionboxEnemy::staticClassID()) || entity == this->target)
     this->destroy( entity );
   this->hitEntity = entity;
@@ -148 +150 @@
   this->angle += HBolt::rotationSpeed * dt;
 
-  for( ObjectList<NPC>::const_iterator eIterator = NPC::objectList().begin(); eIterator !=NPC::objectList().end(); eIterator++)
+  for( ObjectList<ActionboxEnemy>::const_iterator eIterator = ActionboxEnemy::objectList().begin(); eIterator !=ActionboxEnemy::objectList().end(); eIterator++)
   {
     if( ((*eIterator)->getOMListNumber() != (this->origList -1))  && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 8)