Changeset 12396 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h

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/OrxoBlox/OrxoBlox.h (modified) (5 diffs)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h

@@ -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 OrxoBlox.h
-    @brief Declaration of the OrxoBlox class.
-    @ingroup OrxoBlox
-*/
-
 #ifndef _OrxoBlox_H__
 #define _OrxoBlox_H__
@@ -74 +40 @@
 
             PlayerInfo* getPlayer();
-            // void spawnPlayer(PlayerInfo* Player) override;
             virtual void playerPreSpawn(PlayerInfo* player) override;
             virtual void tick(float dt) override;
@@ -89 +54 @@
             OrxoBloxCenterpoint* getCenterpoint(void)
                 { return this->center_; }
-            //OrxoBloxStones* CheckForCollision(OrxoBloxBall* Ball);
             virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
             void count();
@@ -96 +60 @@
             void startWall(void);
             void createWall(void);
-            //void startBall(); //!< Starts the ball with some default speed.
             void cleanup(); //!< Cleans up the Gametype by destroying the ball and the bats.
 
             WeakPtr<OrxoBloxCenterpoint> center_; //!< The playing field.
-            //WeakPtr<OrxoBloxBall> ball_; //!< The OrxoBlox ball.
             unsigned int level_;
 
@@ -108 +70 @@
             
             WeakPtr<OrxoBloxWall> futureWall_;
-            std::vector<OrxoBloxWall*> activeWalls_;
-            std::vector<OrxoBloxStones*> stones_; //!< A list of all stones in play.
             int counter;
             const int max_counter = 4;