Changeset 2100 for code/trunk/src
- Timestamp:
- Nov 1, 2008, 11:41:03 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc
r2099 r2100 38 38 #include "tools/ParticleInterface.h" 39 39 40 #include "SpaceShipAI.h" 41 #include "ParticleSpawner.h" 42 #include "Model.h" 40 #include "objects/worldentities/Model.h" 41 #include "objects/worldentities/ParticleSpawner.h" 43 42 #include "Settings.h" 44 43 … … 97 96 for (ObjectList<Model>::iterator it = ObjectList<Model>::begin(); it; ++it) 98 97 { 99 if ((*it) != this->owner_)98 // if ((*it) != this->owner_) 100 99 { 101 100 radius = it->getScale3D().x * 3.0; … … 104 103 { 105 104 // hit 106 if (it->isA(Class(SpaceShipAI)))107 ((SpaceShipAI*)(*it))->damage(this->damage_);108 105 ParticleSpawner* explosion = new ParticleSpawner(this->explosionTemplateName_, LODParticle::low, 2.0); 109 106 explosion->setPosition(this->getPosition());
Note: See TracChangeset
for help on using the changeset viewer.