Changeset 12378 for code/branches/OrxoBlox_FS19/src

Timestamp:

May 16, 2019, 2:53:00 PM (6 years ago)

Author:

pomselj

Message:

Projectiles survive infinitely

Location:

code/branches/OrxoBlox_FS19/src/modules/weapons

Files:

• projectiles/BallProjectile.cc (modified) (3 diffs)
• projectiles/BallProjectile.h (modified) (1 diff)
• projectiles/BasicProjectile.cc (modified) (4 diffs)
• weaponmodes/BallGun.cc (modified) (3 diffs)

code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc

@@ -104 +104 @@
         Vector3 myPosition = otherObject->getPosition();
         btVector3 positionOtherObject = contactPoint.getPositionWorldOnA();
-        //orxout() << "About to Bounce >D" << endl;
-        //if (positionOtherObject.y < 0) {
-            //this.destroy()
-        //}S
-        //else {
         
             int distance_X = positionOtherObject.getX() - myPosition.x;
@@ -143 +138 @@
     bool BallProjectile::processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs)
     {
-
-        //orxout() << "wanna bounce..." << endl;
         bool result = BasicProjectile::processCollision(otherObject, contactPoint, cs);
         if (result == true) {
             if (otherObject->isA(Class(OrxoBloxStones))) {
                 Bounce(otherObject, contactPoint, cs);
-            }
-        }
-        //orxout() << "BOUNCED!" << endl;
-
+                orxout() << "BOUNCED!" << endl;
+            }
+        }
         return result;
     }
@@ -289 +281 @@
     }
 
+    void BallProjectile::destroyObject(void)
+    {
+        if(GameMode::isMaster()) {
+        }
+    }
+
+
 
 }

code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.h

@@ -65 +65 @@
 
         private:
-
+            void destroyObject() override;
             void registerVariables();
             void changeTexture();

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

@@ -85 +85 @@
     bool BasicProjectile::processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs)
     {
-        //orxout() << "OMG A COLLISION" << endl;
         if (!this->bDestroy_ && GameMode::isMaster())
         {
@@ -93 +92 @@
             if (getDestroyAfterCollision())
             {
+                orxout() << "Destroy that stuff" << endl;
                 this->bDestroy_ = true; // If something is hit, the object is destroyed and can't hit something else.
                                         // The projectile is destroyed by its tick()-function (in the following tick).
@@ -173 +173 @@
     void BasicProjectile::destroyCheck(void)
     {
-        if(GameMode::isMaster() && this->bDestroy_)
+        if(GameMode::isMaster() && this->bDestroy_) {
+            orxout() << "Set true, smhow" << endl;
             this->destroy();
+        }
     }
 
@@ -183 +185 @@
     void BasicProjectile::destroyObject(void)
     {
-        if(GameMode::isMaster())
+        if(GameMode::isMaster()) {
+            orxout() << "Deleted myself" << endl;
             this->destroy();
+        }
     }
 }

code/branches/OrxoBlox_FS19/src/modules/weapons/weaponmodes/BallGun.cc

@@ -60 +60 @@
         this->reloadTime_ = 0.25f;
         this->damage_ = 0.0f; //default 15
-        this->speed_ = 50;
+        this->speed_ = 100;
         this->delay_ = 100;
         this->setMunitionName("BallMunition");
@@ -104 +104 @@
     void BallGun::fire()
     {
-        orxout() << "fire" << endl;
         this->delayTimer_.startTimer();
     }
@@ -115 +114 @@
     {
         assert( this->getWeapon() && this->getWeapon()->getWeaponPack() && this->getWeapon()->getWeaponPack()->getWeaponSystem() && this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn() );
-        orxout() << "SHOT!" << endl;
         // Create the projectile.
         Projectile* projectile = new BallProjectile(this->getContext());