Changeset 2100 for code/trunk

Timestamp:

Nov 1, 2008, 11:41:03 PM (16 years ago)

Author:

landauf

Message:

did some small adjustments in Projectile.cc although it's only a sample

File:

• code/trunk/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) (3 diffs)

code/trunk/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc

@@ -38 +38 @@
 #include "tools/ParticleInterface.h"
 
-#include "SpaceShipAI.h"
-#include "ParticleSpawner.h"
-#include "Model.h"
+#include "objects/worldentities/Model.h"
+#include "objects/worldentities/ParticleSpawner.h"
 #include "Settings.h"
 
@@ -97 +96 @@
         for (ObjectList<Model>::iterator it = ObjectList<Model>::begin(); it; ++it)
         {
-            if ((*it) != this->owner_)
+//            if ((*it) != this->owner_)
             {
                 radius = it->getScale3D().x * 3.0;
@@ -104 +103 @@
                 {
                     // hit
-                    if (it->isA(Class(SpaceShipAI)))
-                        ((SpaceShipAI*)(*it))->damage(this->damage_);
                     ParticleSpawner* explosion = new ParticleSpawner(this->explosionTemplateName_, LODParticle::low, 2.0);
                     explosion->setPosition(this->getPosition());