Changeset 10502 for code/branches/weaponFS15

Timestamp:

May 27, 2015, 4:23:44 PM (9 years ago)

Author:

meggiman

Message:

Bugfix: Game crashed if a pawn was directly hit by the bomb. Changed Radar Color to red.

Location:

code/branches/weaponFS15/src/modules/weapons/projectiles

Files:

• GravityBomb.cc (modified) (4 diffs)
• GravityBomb.h (modified) (1 diff)
• GravityBombField.cc (modified) (2 diffs)

code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.cc

@@ -12 +12 @@
         RegisterClass(GravityBomb);
 
-        const float GravityBomb::LIFETIME = 5;  ///< The gravity bomb lifetime in seconds.
+        const float GravityBomb::LIFETIME = 2.5;  ///< The gravity bomb lifetime in seconds.
 
         GravityBomb::GravityBomb(Context* context):
@@ -22 +22 @@
 
                         this->setMass(10.0);
-                        this->isDetonated_ = false;
+                        this->hasCollided_ = false;
                         if (GameMode::isMaster())
                         {
@@ -67 +67 @@
         void GravityBomb::tick(float dt)
         {
-                        timeToLife_ -= dt;
-                        if(timeToLife_ < 0)
-                        {
-                                //orxout(debug_output) << "bomb has stoped moving" <<endl;
-                                setVelocity(Vector3::ZERO); //Stop the bomb.
-                                isDetonated_ = true;
-                        }
-                        else
-                        {
-                                //orxout(debug_output)<< "Time to live:" << timeToLife_ <<endl;
-                                destroyCheck(); //Every BasicProjectil has to call this method in each tick.
-                        }
-                        if(isDetonated_) detonate();
-                        else SUPER(GravityBomb, tick, dt);
+                SUPER(GravityBomb, tick, dt);
+                timeToLife_ -= dt;
+                if (timeToLife_ < 0)
+                {
+                        //orxout(debug_output) << "bomb has stoped moving" <<endl;
+                        setVelocity(Vector3::ZERO); //Stop the bomb.
+                        detonate();
+                        this->destroy();
+                }
+                else 
+                {
+                        if (hasCollided_) detonate();
+                        destroyCheck(); //Bomb is going to be destroyed by destroyCheck(). As written in BasicProectile, this Method should be called by every Projectile.
+                }
         }
 
         bool GravityBomb::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
         {
-                if(otherObject != getShooter()) //Ensure that the bomb cannot collide with its shooter.
-                {
-                        orxout(debug_output) << "collides" << endl;
-                        processCollision(otherObject, contactPoint,cs);
-                        isDetonated_ = true;
-                        return true;
-                }
-                else{
-                        //orxout(debug_output) << "collided with shooter. Has no effect..." << endl;
-                        return false;
-                }
+                hasCollided_ = processCollision(otherObject, contactPoint, cs);
+                return hasCollided_;
         }
 
@@ -106 +97 @@
                 //orxout(debug_output) << "detonating. Creating GravityBombField." <<endl;
                 //orxout(debug_output) << "Field is at Position: " << getPosition() << endl;
-                this->destroy();
         }
 }

code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.h

@@ -48 +48 @@
                 static const float LIFETIME;
 
-                bool isDetonated_; //Used to check whether the Bomb has to be destroyed during next tick.
+                bool hasCollided_;
                 float timeToLife_; //Time the bomb flies before it explodes.
                 WorldSound* bombSound_;

code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBombField.cc

@@ -16 +16 @@
         const float GravityBombField::FORCE_FIELD_LIFETIME = 15;
         const float GravityBombField::FORCE_SPHERE_START_RADIUS = 250;
-        const float GravityBombField::FORCE_SPHERE_START_STRENGTH = -500;
+        const float GravityBombField::FORCE_SPHERE_START_STRENGTH = -700;
         const float GravityBombField::PEAK_EXPLOSION_FORCE = 5e4;
         const float GravityBombField::FORCE_FIELD_EXPLOSION_DAMMAGE = 100;
@@ -40 +40 @@
 
                 //Make the Field visible on Radar and minimap.
-                this->setRadarObjectColour(ColourValue(0.2, 0.2, 1.0,1)); // Blue
+                this->setRadarObjectColour(ColourValue(1.0, 0.0, 0.2,1)); // Red
                 this->setRadarObjectShape(RadarViewable::Dot);
-                this->setRadarObjectScale(0.5f);
+                this->setRadarObjectScale(1.0f);