Changeset 8250

Timestamp:

Apr 18, 2011, 2:14:17 PM (14 years ago)

Author:

msalomon

Message:

Last changes to the SpaceRace game type.

Location:

code/branches/spacerace/src/modules/gametypes

Files:

• SpaceRace.cc (modified) (3 diffs)
• SpaceRace.h (modified) (3 diffs)

code/branches/spacerace/src/modules/gametypes/SpaceRace.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Aurelian Jaggi
+ *     Mauro Salomon
  *   Co-authors:
  *      ...
@@ -32 +32 @@
 #include "network/Host.h"
 
-namespace orxonox{
+namespace orxonox
+{
     CreateUnloadableFactory(SpaceRace);
     
@@ -38 +39 @@
     {
         RegisterObject(SpaceRace);
-        this->numberOfCheckpoints_ = 0;
         this->checkpointsReached_ = 0;
         this->numberOfBots_ = 0;        

code/branches/spacerace/src/modules/gametypes/SpaceRace.h

@@ -21 +21 @@
  *
  *   Author:
- *      Aurelian Jaggi
+ *      Mauro Salomon
  *   Co-authors:
  *      ...
@@ -32 +32 @@
 #include "gametypes/Gametype.h"
 #include "gametypes/GametypesPrereqs.h"
-#include "objects/triggers/DistanceTriggerBeacon.h"
+#include "RaceCheckPoint.h"
 #include <boost/concept_check.hpp>
 
@@ -45 +45 @@
             virtual void tick(float dt);
             
-            virtual void start();
-            virtual void end();
+            inline void newCheckpointReached()
+                { this->checkpointsReached_++; }
+            inline void setCheckpointsReached(int n)
+                { this->checkpointsReached_ = n;}
+            inline int getCheckpointsReached()
+                { return this->checkpointsReached_; }
             
         protected:
-            inline void newCheckpointReached()
-              { this->checkpointsReached++; }
-            inline bool lastCheckpointReached()
-              { return (this->checkpointsReached == this->numberOfCheckpoints); }
+            
         private:
-            int numberOfCheckpoints_;
             int checkpointsReached_;
-    
     };
 }