- Timestamp:
- Jan 24, 2007, 2:49:55 PM (18 years ago)
- Location:
- branches/playability/src/world_entities/projectiles
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/playability/src/world_entities/projectiles/acid_splash.cc
r10298 r10328 60 60 // this->grid->setTexture( "maps/blub.png"); 61 61 62 this->grid->toList( this->getOMListNumber());63 this->toList(OM_ENVIRON);62 this->grid->toList(OM_ENVIRON); //this->getOMListNumber()); 63 //this->toList(OM_ENVIRON); 64 64 } 65 65 … … 73 73 // delete this->emitter; 74 74 //delete this->grid; 75 76 this->grid->toList(OM_DEAD); 75 77 76 78 } … … 100 102 } 101 103 102 104 /* 103 105 void AcidSplash::collidesWith(WorldEntity* entity, const Vector& location) 104 106 { … … 117 119 //this->deactivate(); 118 120 } 119 121 */ 120 122 /** 121 123 * signal tick, time dependent things will be handled here … … 134 136 135 137 this->grid->tick(dt); 138 139 for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++) 140 { 141 if( ((*eIterator)->getOMListNumber() == (this->getOMListNumber() -1)) && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 8) 142 { 143 (*eIterator)->hit (this->getDamage(),this); 144 this->deactivate(); 145 } 146 } 136 147 137 148 } -
branches/playability/src/world_entities/projectiles/acid_splash.h
r10179 r10328 25 25 virtual void deactivate(); 26 26 27 virtual void collidesWith(WorldEntity* entity, const Vector& location);27 // virtual void collidesWith(WorldEntity* entity, const Vector& location); 28 28 29 29 virtual void destroy (WorldEntity* killer);
Note: See TracChangeset
for help on using the changeset viewer.