Changeset 12396 for code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc

Timestamp:

May 17, 2019, 1:32:44 PM (5 years ago)

Author:

pomselj

Message:

Jesus safed our souls and stopped the crashing. Hallowed be his name and hallowed be his followers sevy and aryo, first of their names, saviors of the andals the raynars and the first nerds. Fourier is love btw

File:

• code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc (modified) (5 diffs)

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"
@@ -115 +82 @@
                 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);
-        //}
     }
 
@@ -142 +102 @@
             if (otherObject->isA(Class(OrxoBloxStones))) {
                 Bounce(otherObject, contactPoint, cs);
-                orxout() << "BOUNCED!" << endl;
                 
             }
@@ -187 +146 @@
                 position.z = this-> fieldHeight_;
                 
-                //orxoblox_->LevelUp();
                 orxoblox_->count();
                 suicidal = true;
@@ -258 +216 @@
     }
 
+
+    //This is an override to prevent getting killed by the program
     void BallProjectile::destroyObject(void)
     {