Changeset 9959 in orxonox.OLD

Timestamp:

Nov 26, 2006, 11:44:49 AM (17 years ago)

Author:

nicolasc

Message:

moved damage attr to proteced; collidesWith checks against SpaceShip and does some damage

Location:

branches/playability/src/world_entities

Files:

• projectiles/projectile.cc (modified) (1 diff)
• projectiles/projectile.h (modified) (4 diffs)
• space_ships/space_ship.cc (modified) (1 diff)

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

@@ -122 +122 @@
 
 
-
-void Projectile::collidesWith (WorldEntity* entity, const Vector& location)
+void Projectile::collidesWith (SpaceShip* target, const Vector& location)
 {
-  //if (entity->isA(CL_SPACE_SHIP)) /* FIXME make sure that entity is a spaceship*/
-  //  entity->damage(this->physDamage, this->elecDamage); /* and do some damage*/
-  this->destroy(entity);
+  target->damage(this->physDamage, this->elecDamage);
+  this->destroy(target);
 }
 

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

@@ -12 +12 @@
 #include "world_entity.h"
 #include "loading/fast_factory.h"
+#include "space_ships/space_ship.h"
 
 #include "sound_source.h"
@@ -44 +45 @@
     virtual void destroy (WorldEntity* killer);
 
-    virtual void collidesWith (WorldEntity* entity, const Vector& location);   //!< collision handler as used in diverse weapons
+    virtual void collidesWith (SpaceShip* target, const Vector& location);  //!< collision handler; used against SpaceShip as most target will be
+
 
     virtual void tick (float dt);
@@ -63 +65 @@
     float                  lifeSpan;                  //!< The entire lifespan of the Shoot. in seconds
 
+    float                   physDamage;               //!< damage to shield and armor
+    float                   elecDamage;               //!< damage to elctronic
+
     Vector                 flightDirection;           //!< DOF direction in which the shoot flighs
 
@@ -73 +78 @@
     OrxSound::SoundBuffer  explosionBuffer;
     OrxSound::SoundBuffer  engineBuffer;
-
-    int                     physDamage;               //!< damage to shield and armor
-    int                     elecDamage;               //!< damage to elctronic
 };
 

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -50 +50 @@
 // #include "lib/gui/gl_gui/glgui_bar.h"
 // #include "lib/gui/gl_gui/glgui_pushbutton.h"
-