Changeset 8855 for code/trunk/src/modules/weapons/projectiles/Projectile.cc

Timestamp:

Aug 22, 2011, 3:05:26 PM (14 years ago)

Author:

dafrick

Message:

Cleaning up game immersion. Roughly documenting weapons module.

File:

• code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) (5 diffs)

code/trunk/src/modules/weapons/projectiles/Projectile.cc

@@ -27 +27 @@
  */
 
+/**
+    @file Projectile.h
+    @brief Implementation of the Projectile class.
+*/
+
 #include "Projectile.h"
 
+#include "core/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
-#include "core/ConfigValueIncludes.h"
 #include "core/GameMode.h"
 #include "core/command/Executor.h"
+
 #include "objects/collisionshapes/SphereCollisionShape.h"
 #include "worldentities/pawns/Pawn.h"
-#include "graphics/ParticleSpawner.h"
 
 namespace orxonox
@@ -46 +51 @@
 
         this->setConfigValues();
-        this->owner_ = 0;
 
         // Get notification about collisions
         if (GameMode::isMaster())
         {
-            this->setMass(1.0);
+            this->setMass(1.0f);
             this->enableCollisionCallback();
             this->setCollisionResponse(false);
@@ -57 +61 @@
 
             SphereCollisionShape* shape = new SphereCollisionShape(this);
-            shape->setRadius(20);
+            shape->setRadius(20.0f);
             this->attachCollisionShape(shape);
 
-            this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&Projectile::destroyObject, this)));
+            this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&BasicProjectile::destroyObject, this)));
         }
     }
@@ -70 +74 @@
     void Projectile::setConfigValues()
     {
-        SetConfigValue(lifetime_, 4.0).description("The time in seconds a projectile stays alive");
+        SetConfigValue(lifetime_, 4.0f).description("The time in seconds a projectile stays alive");
     }
 
@@ -81 +85 @@
             return;
 
-        if (this->getBDestroy())
-            this->destroy(); // TODO: use a scheduler instead of deleting the object right here in tick()
+        this->destroyCheck();
     }
 
-    void Projectile::destroyObject()
+    bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        if (GameMode::isMaster())
-            this->destroy();
+        return this->processCollision(otherObject, contactPoint);
     }
 
-    /* Calls the collidesAgainst function of BasicProjectile
-     */
-    bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
-    {
-        return BasicProjectile::basicCollidesAgainst(otherObject,contactPoint,this->getOwner(),this);
-    }
-
-    void Projectile::setOwner(Pawn* owner)
-    {
-        this->owner_ = owner;
-    }
 }