Changeset 8492 for code/branches/gameimmersion/src/modules/weapons/projectiles

Timestamp:

May 16, 2011, 5:25:00 PM (13 years ago)

Author:

simonmie

Message:

New Shield effect added (from tibork), first working BasicProjectile class, changes in weapon classes to fit new BasicProjectile system, some spam messages in Pawn.cc removed

Location:

code/branches/gameimmersion/src/modules/weapons/projectiles

Files:

• BasicProjectile.cc (added)
• BasicProjectile.h (added)
• CMakeLists.txt (modified) (1 diff)
• Projectile.cc (modified) (5 diffs)
• Projectile.h (modified) (4 diffs)

code/branches/gameimmersion/src/modules/weapons/projectiles/CMakeLists.txt

@@ -6 +6 @@
   Rocket.cc
   SimpleRocket.cc
+  BasicProjectile.cc
 )

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

@@ -36 +36 @@
 #include "worldentities/pawns/Pawn.h"
 #include "graphics/ParticleSpawner.h"
+#include "BasicProjectile.h"
 
 namespace orxonox
@@ -41 +42 @@
     CreateFactory(Projectile);
 
-    Projectile::Projectile(BaseObject* creator) : MovableEntity(creator)
+    Projectile::Projectile(BaseObject* creator) : MovableEntity(creator), BasicProjectile()
     {
         RegisterObject(Projectile);
 
         this->setConfigValues();
-        this->bDestroy_ = false;
+//        this->bDestroy_ = false;
         this->owner_ = 0;
-        this->damage_ = 115;
+//        this->damage_ = 115;
 ///////////////////me
-        this->healthdamage_ = 0;
-        this->shielddamage_ = 0;
+//        this->healthdamage_ = 0;
+//        this->shielddamage_ = 0;
 ///////////////////end me
 
@@ -88 +89 @@
             return;
 
-        if (this->bDestroy_)
+        if (this->getBDestroy())
             this->destroy(); // TODO: use a scheduler instead of deleting the object right here in tick()
     }
@@ -98 +99 @@
     }
 
+    bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    {
+        return BasicProjectile::basicCollidesAgainst(otherObject,contactPoint,this->owner_,this);
+    }
+
 //////////////////////////me edit
-    bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+/*    bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
         if (!this->bDestroy_ && GameMode::isMaster())
@@ -150 +156 @@
     }
 //////////////////////////////////////////////////////////////////////end edit
-
+*/
     void Projectile::setOwner(Pawn* owner)
     {
         this->owner_ = owner;
     }
+
 }

code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.h

@@ -35 +35 @@
 #include "worldentities/MovableEntity.h"
 
+#include "BasicProjectile.h"
+
 namespace orxonox
 {
-    class _WeaponsExport Projectile : public MovableEntity
+    class _WeaponsExport Projectile : public MovableEntity, public BasicProjectile
     {
         public:
@@ -49 +51 @@
             virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
 
-            inline void setDamage(float damage)
+/*            inline void setDamage(float damage)
                 { this->damage_ = damage;  COUT(3) << "DAMAGE-SET-FUNKTION WIRD AUFGERUFEN" << endl; }
             inline float getDamage() const
                 { return this->damage_; }
-
+*/
             void setOwner(Pawn* owner);
             inline Pawn* getOwner() const
                 { return this->owner_; }
 
-////////////////////me
+/*///////////////////me
 
             inline void setHealthDamage(float healthdamage)
@@ -71 +73 @@
 
 ///////////////////end me
-
+*/
 
         private:
             WeakPtr<Pawn> owner_;
             float lifetime_;
-            float damage_;
+/*            float damage_;
 ///////me
             float healthdamage_;
@@ -82 +84 @@
 ///////end me
             bool bDestroy_;
-            Timer destroyTimer_;
+*/            Timer destroyTimer_;
     };
 }