Changeset 8533 for code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.cc

Timestamp:

May 23, 2011, 2:26:25 PM (13 years ago)

Author:

simonmie

Message:

SimpleRocket and Rocket are now BasicProjectiles - damage is working now correctly with these two. More spam messages removed.

File:

• code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.cc (modified) (5 diffs)

code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.cc

@@ -43 +43 @@
 #include "Scene.h"
 
+#include "BasicProjectile.h"
+
 namespace orxonox
 {
@@ -52 +54 @@
         Constructor. Registers the object and initializes some default values.
     */
-    Rocket::Rocket(BaseObject* creator) : ControllableEntity(creator)
+    Rocket::Rocket(BaseObject* creator) : ControllableEntity(creator), BasicProjectile()
     {
         RegisterObject(Rocket);// - register the Rocket class to the core
 
         this->localAngularVelocity_ = 0;
-        this->bDestroy_ = false;
+//        this->bDestroy_ = false;
         this->lifetime_ = 100;
 
@@ -175 +177 @@
         if( GameMode::isMaster() )
         {
-            if( this->bDestroy_ )
+            if( this->getBDestroy() )
                 this->destroy();
 
@@ -183 +185 @@
     bool Rocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        if (!this->bDestroy_ && GameMode::isMaster())
+        return BasicProjectile::basicCollidesAgainst(otherObject,contactPoint,this->owner_,this);
+
+/* * /        if (!this->bDestroy_ && GameMode::isMaster())
         {
             if (otherObject == this->owner_)
@@ -216 +220 @@
 //             this->destroy();
         }
-        return false;
+/ * */        return false;
     }