Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 17, 2019, 1:32:44 PM (6 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

Location:
code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r12394 r12396  
    1 /*
    2  *   ORXONOX - the hottest 3D action shooter ever to exist
    3  *                    > www.orxonox.net <
    4  *
    5  *
    6  *   License notice:
    7  *
    8  *   This program is free software; you can redistribute it and/or
    9  *   modify it under the terms of the GNU General Public License
    10  *   as published by the Free Software Foundation; either version 2
    11  *   of the License, or (at your option) any later version.
    12  *
    13  *   This program is distributed in the hope that it will be useful,
    14  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
    15  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    16  *   GNU General Public License for more details.
    17  *
    18  *   You should have received a copy of the GNU General Public License
    19  *   along with this program; if not, write to the Free Software
    20  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
    21  *
    22  *   Author:
    23  *      Fabian 'x3n' Landau
    24  *   Co-authors:
    25  *      ...
    26  *
    27  */
    28 
    29 /**
    30     @file ParticleProjectile.h
    31     @brief Implementation of the ParticleProjectile class.
    32 */
    33 
    341#include "BallProjectile.h"
    352#include "gametypes/Gametype.h"
    … …  
    11582                distance_Z = -distance_Z;
    11683
    117             //orxout() << distance_X << endl;
    118             //orxout() << distance_Z << endl;
    119 
    12084            if (distance_X < distance_Z) {
    12185                velocity.z = -velocity.z;
    122                 //orxout() << "z" << endl;
    12386            }
    12487            if (distance_Z < distance_X) {
    12588                velocity.x = -velocity.x;
    126                 //orxout() << "x" << endl;
    12789            }
    12890            else {
    12991                velocity.x = -velocity.x;
    13092                velocity.z = -velocity.z;
    131                 //orxout() << "both" << endl;
    13293            }
    13394            this->setVelocity(velocity);
    134         //}
    13595    }
    13696
    … …  
    142102            if (otherObject->isA(Class(OrxoBloxStones))) {
    143103                Bounce(otherObject, contactPoint, cs);
    144                 orxout() << "BOUNCED!" << endl;
    145104               
    146105            }
    … …  
    187146                position.z = this-> fieldHeight_;
    188147               
    189                 //orxoblox_->LevelUp();
    190148                orxoblox_->count();
    191149                suicidal = true;
    … …  
    258216    }
    259217
     218
     219    //This is an override to prevent getting killed by the program
    260220    void BallProjectile::destroyObject(void)
    261221    {

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

    r12384 r12396  
    1 /*
    2  *   ORXONOX - the hottest 3D action shooter ever to exist
    3  *                    > www.orxonox.net <
    4  *
    5  *
    6  *   License notice:
    7  *
    8  *   This program is free software; you can redistribute it and/or
    9  *   modify it under the terms of the GNU General Public License
    10  *   as published by the Free Software Foundation; either version 2
    11  *   of the License, or (at your option) any later version.
    12  *
    13  *   This program is distributed in the hope that it will be useful,
    14  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
    15  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    16  *   GNU General Public License for more details.
    17  *
    18  *   You should have received a copy of the GNU General Public License
    19  *   along with this program; if not, write to the Free Software
    20  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
    21  *
    22  *   Author:
    23  *      Fabian 'x3n' Landau
    24  *   Co-authors:
    25  *      ...
    26  *
    27  */
    28 
    29 /**
    30     @file ParticleProjectile.h
    31     @brief Definition of the ParticleProjectile class.
    32 */
    33 
    341#ifndef _BallProjectile_H__
    352#define _BallProjectile_H__
    … …  
    4512{
    4613
    47     /**
    48     @brief
    49         A projectile that is represented by particles.
    50     @author
    51         Fabian 'x3n' Landau
    52     @ingroup WeaponsProjectiles
    53     */
    5414    class _WeaponsExport BallProjectile : public BillboardProjectile
    5515    {
Note: See TracChangeset for help on using the changeset viewer.