Changeset 12402 for code/branches/OrxoBlox_FS19/src/modules/weapons

Timestamp:

May 20, 2019, 3:09:55 PM (6 years ago)

Author:

ahuwyler

Message:

last commit

Location:

code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles

Files:

• BallProjectile.cc (modified) (6 diffs)
• BallProjectile.h (modified) (1 diff)

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

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *                    > www.orxonox.net <
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+/**
+    @file ParticleProjectile.h
+    @brief Implementation of the ParticleProjectile class.
+*/
+
 #include "BallProjectile.h"
 #include "gametypes/Gametype.h"
+#include <OrxoBlox/OrxoBloxStones.h>
 
 
@@ -27 +61 @@
         this->orxoblox_ = this->getOrxoBlox();
         this->setCollisionShapeRadius(2.5);
-        this->setDamage(1000);
-                //setEffect("Orxonox/sparks2");
+        
+        //setEffect("Orxonox/sparks2");
     }
 
@@ -81 +115 @@
                 distance_Z = -distance_Z;
 
+            //orxout() << distance_X << endl;
+            //orxout() << distance_Z << endl;
+
             if (distance_X < distance_Z) {
                 velocity.z = -velocity.z;
+                //orxout() << "z" << endl;
             }
             if (distance_Z < distance_X) {
                 velocity.x = -velocity.x;
+                //orxout() << "x" << endl;
             }
             else {
                 velocity.x = -velocity.x;
                 velocity.z = -velocity.z;
+                //orxout() << "both" << endl;
             }
             this->setVelocity(velocity);
+        //}
     }
 
@@ -101 +142 @@
             if (otherObject->isA(Class(OrxoBloxStones))) {
                 Bounce(otherObject, contactPoint, cs);
+                (orxonox_cast<OrxoBloxStones*>(otherObject))->gotHit();
                 
             }
@@ -145 +187 @@
                 position.z = this-> fieldHeight_;
                 orxoblox_->count();
-
                 suicidal = true;
                 
@@ -215 +256 @@
     }
 
-
-    //This is an override to prevent getting killed by the program
     void BallProjectile::destroyObject(void)
     {

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

@@ -38 +38 @@
             std::string materialBase_; //!< The base name of the material.
             OrxoBlox* orxoblox_;
+            OrxoBloxStones* stone_;
     };
 }