[Orxonox-commit 3468] r8154 - in code/branches/spacerace/src: modules orxonox/gametypes

[dafrick at orxonox.net]

Author: dafrick
Date: 2011-03-28 16:57:25 +0200 (Mon, 28 Mar 2011)
New Revision: 8154

Removed:
   code/branches/spacerace/src/orxonox/gametypes/SpaceRace.cc
   code/branches/spacerace/src/orxonox/gametypes/SpaceRace.h
Modified:
   code/branches/spacerace/src/modules/CMakeLists.txt
   code/branches/spacerace/src/orxonox/gametypes/CMakeLists.txt
Log:
Moving SpaceRace into modules.


Modified: code/branches/spacerace/src/modules/CMakeLists.txt
===================================================================
--- code/branches/spacerace/src/modules/CMakeLists.txt	2011-03-28 14:45:56 UTC (rev 8153)
+++ code/branches/spacerace/src/modules/CMakeLists.txt	2011-03-28 14:57:25 UTC (rev 8154)
@@ -26,6 +26,7 @@
 ################ Sub Directories ################
 
 ADD_SUBDIRECTORY(designtools)
+ADD_SUBDIRECTORY(gametypes)
 ADD_SUBDIRECTORY(notifications)
 ADD_SUBDIRECTORY(objects)
 ADD_SUBDIRECTORY(overlays)

Modified: code/branches/spacerace/src/orxonox/gametypes/CMakeLists.txt
===================================================================
--- code/branches/spacerace/src/orxonox/gametypes/CMakeLists.txt	2011-03-28 14:45:56 UTC (rev 8153)
+++ code/branches/spacerace/src/orxonox/gametypes/CMakeLists.txt	2011-03-28 14:57:25 UTC (rev 8154)
@@ -7,5 +7,4 @@
   Asteroids.cc
   Dynamicmatch.cc
   LastManStanding.cc
-  SpaceRace.cc
 )

Deleted: code/branches/spacerace/src/orxonox/gametypes/SpaceRace.cc
===================================================================
--- code/branches/spacerace/src/orxonox/gametypes/SpaceRace.cc	2011-03-28 14:45:56 UTC (rev 8153)
+++ code/branches/spacerace/src/orxonox/gametypes/SpaceRace.cc	2011-03-28 14:57:25 UTC (rev 8154)
@@ -1,50 +0,0 @@
-/*
- *   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:
- *      Aurelian Jaggi
- *   Co-authors:
- *      ...
- *
- */
-
-#include "SpaceRace.h"
-
-#include "core/CoreIncludes.h"
-#include "network/Host.h"
-
-namespace orxonox{
-    CreateUnloadableFactory(SpaceRace);
-    
-    SpaceRace::SpaceRace(BaseObject* creator) : Gametype(creator)
-    {
-	RegisterObject(SpaceRace);
-	this->numberOfCheckpoints_ = 0;
-	this->checkpointsReached_ = 0;
-	this->numberOfBots_ = 0;	
-    }
-    
-    void SpaceRace::tick(float dt)
-    {
-	orxonox::Gametype::tick(dt);
-    }
-
-}
\ No newline at end of file

Deleted: code/branches/spacerace/src/orxonox/gametypes/SpaceRace.h
===================================================================
--- code/branches/spacerace/src/orxonox/gametypes/SpaceRace.h	2011-03-28 14:45:56 UTC (rev 8153)
+++ code/branches/spacerace/src/orxonox/gametypes/SpaceRace.h	2011-03-28 14:57:25 UTC (rev 8154)
@@ -1,62 +0,0 @@
-/*
- *   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:
- *      Aurelian Jaggi
- *   Co-authors:
- *      ...
- *
- */
-
-#ifndef _SpaceRace_H__
-#define _SpaceRace_H__
-
-#include "Gametype.h"
-#include "OrxonoxPrereqs.h"
-#include "objects/triggers/DistanceTriggerBeacon.h"
-#include <boost/concept_check.hpp>
-
-namespace orxonox
-{
-    class _OrxonoxExport SpaceRace : public Gametype
-    {
-	public:
-	    SpaceRace(BaseObject* creator);
-	    virtual ~SpaceRace(){};
-	    
-	    virtual void tick(float dt);
-	    
-	    virtual void start();
-	    virtual void end();
-	    
-	protected:
-	    inline void newCheckpointReached()
-	      { this->checkpointsReached++; }
-	    inline bool lastCheckpointReached()
-	      { return (this->checkpointsReached == this->numberOfCheckpoints); }
-	private:
-	    int numberOfCheckpoints_;
-	    int checkpointsReached_;
-    
-    };
-}
-
-#endif
\ No newline at end of file