Changeset 10073 for code/branches/presentationFS14/src/modules/weapons

Timestamp:

May 22, 2014, 2:49:16 PM (10 years ago)

Author:

smerkli

Message:

Merged modularships branch

Location:

code/branches/presentationFS14

Files:

• . (modified) (1 prop)
• src/modules/weapons/projectiles/BasicProjectile.cc (modified) (3 diffs)
• src/modules/weapons/projectiles/BasicProjectile.h (modified) (1 diff)
• src/modules/weapons/projectiles/Projectile.cc (modified) (1 diff)
• src/modules/weapons/projectiles/Projectile.h (modified) (1 diff)
• src/modules/weapons/projectiles/Rocket.cc (modified) (1 diff)
• src/modules/weapons/projectiles/Rocket.h (modified) (1 diff)
• src/modules/weapons/projectiles/SimpleRocket.cc (modified) (1 diff)
• src/modules/weapons/projectiles/SimpleRocket.h (modified) (1 diff)

code/branches/presentationFS14/src/modules/weapons/projectiles/BasicProjectile.cc

@@ -78 +78 @@
     @see Pawn.h
     */
-    bool BasicProjectile::processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    bool BasicProjectile::processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs)
     {
         if (!this->bDestroy_ && GameMode::isMaster())
@@ -96 +96 @@
             if (victim)
             {
-                victim->hit(this->getShooter(), contactPoint, this->getDamage(), this->getHealthDamage(), this->getShieldDamage());
+                victim->hit(this->getShooter(), contactPoint, cs, this->getDamage(), this->getHealthDamage(), this->getShieldDamage());
                 victim->startReloadCountdown();
             }
@@ -141 +141 @@
     }
 
+
     /**
     @brief

code/branches/presentationFS14/src/modules/weapons/projectiles/BasicProjectile.h

@@ -119 +119 @@
 
         protected:
-            bool processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+            bool processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs);
             void destroyCheck(void);
 

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

@@ -88 +88 @@
     }
 
-    bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    bool Projectile::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
     {
-        return this->processCollision(otherObject, contactPoint);
+        return this->processCollision(otherObject, contactPoint, cs);
     }
 

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

@@ -64 +64 @@
 
             virtual void tick(float dt);
-            virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
 
         private:

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

@@ -191 +191 @@
     }
 
-    bool Rocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
-    {
-        return this->processCollision(otherObject, contactPoint);
+    bool Rocket::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
+    {
+        return this->processCollision(otherObject, contactPoint, cs);
     }
 

code/branches/presentationFS14/src/modules/weapons/projectiles/Rocket.h

@@ -64 +64 @@
             virtual void tick(float dt); //!< Defines which actions the Rocket has to take in each tick.
 
-            virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
             virtual void destroyObject(void);
             void destructionEffect();

code/branches/presentationFS14/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -172 +172 @@
     }
 
-    bool SimpleRocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
-    {
-        return this->processCollision(otherObject, contactPoint);
+    bool SimpleRocket::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
+    {
+        return this->processCollision(otherObject, contactPoint, cs);
     }
 

code/branches/presentationFS14/src/modules/weapons/projectiles/SimpleRocket.h

@@ -64 +64 @@
             virtual void tick(float dt);
 
-            virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
 
             void disableFire(); //!< Method to disable the fire and stop all acceleration