Changeset 10328 in orxonox.OLD

Timestamp:

Jan 24, 2007, 2:49:55 PM (17 years ago)

Author:

marcscha

Message:

acid splash fix

Location:

branches/playability/src/world_entities/projectiles

Files:

• acid_splash.cc (modified) (5 diffs)
• acid_splash.h (modified) (1 diff)

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

@@ -60 +60 @@
 //     this->grid->setTexture( "maps/blub.png");
 
-  this->grid->toList(this->getOMListNumber());
-  this->toList(OM_ENVIRON);
+  this->grid->toList(OM_ENVIRON); //this->getOMListNumber());
+  //this->toList(OM_ENVIRON);
 }
 
@@ -73 +73 @@
   // delete this->emitter;
   //delete this->grid;
+  
+  this->grid->toList(OM_DEAD);
   
 }
@@ -100 +102 @@
 }
 
-
+/*
 void AcidSplash::collidesWith(WorldEntity* entity, const Vector& location)
 {
@@ -117 +119 @@
   //this->deactivate();
 }
-
+*/
 /**
  *  signal tick, time dependent things will be handled here
@@ -134 +136 @@
 
   this->grid->tick(dt);
+
+  for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++)
+  {
+    if( ((*eIterator)->getOMListNumber() == (this->getOMListNumber() -1))  && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 8)
+    {
+      (*eIterator)->hit (this->getDamage(),this);
+      this->deactivate();
+    }
+  }
 
 }

branches/playability/src/world_entities/projectiles/acid_splash.h

@@ -25 +25 @@
     virtual void deactivate();
 
-    virtual void collidesWith(WorldEntity* entity, const Vector& location);
+ //   virtual void collidesWith(WorldEntity* entity, const Vector& location);
 
     virtual void destroy (WorldEntity* killer);