Changeset 10345 in orxonox.OLD for branches/playability/src/world_entities/projectiles/acid_splash.cc

Timestamp:

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

Author:

marcscha

Message:

SegFault prevention hack in fast factory

File:

• branches/playability/src/world_entities/projectiles/acid_splash.cc (modified) (6 diffs)

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

@@ -56 +56 @@
 
 
-  int rnd = rand()/3;
+  int rnd = int(rand() % 3);
 
   switch (rnd){
@@ -76 +76 @@
 //     this->grid->setTexture( "maps/blub.png");
 
-  this->grid->toList(OM_ENVIRON); //this->getOMListNumber());
-  this->toList(OM_ENVIRON);
+  this->grid->toList(OM_ENVIRON); 
 }
 
@@ -89 +88 @@
   // delete this->emitter;
   //delete this->grid;
-  
   this->grid->toList(OM_DEAD);
   
@@ -97 +95 @@
 void AcidSplash::activate()
 {
-  this->unhide();
+  this->origList = this->getOMListNumber();
+  this->toList(OM_ENVIRON);
+ // this->unhide();
   this->grid->setVisibiliy(true);
 
@@ -110 +110 @@
   this->lifeCycle = 0.0;
 
-  this->hide();
+ // this->hide();
   this->grid->setVisibiliy(false);
-  this->toList(OM_DEAD);
+  this->lifeCycle = 0.0;
+  this->toList(OM_NULL);
+  //this->toList(OM_DEAD);
   this->removeNode();
   
@@ -155 +157 @@
   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)
+    if( ((*eIterator)->getOMListNumber() != (this->origList -1))  && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 8)
     {
       (*eIterator)->hit (this->getDamage(),this);