Changeset 8767 for code/trunk/src/modules/gametypes

Timestamp:

Jul 20, 2011, 11:27:45 PM (13 years ago)

Author:

dafrick

Message:

Some cleanup…

Location:

code/trunk/src/modules/gametypes

Files:

• RaceCheckPoint.cc (modified) (7 diffs)
• RaceCheckPoint.h (modified) (1 diff)
• SpaceRace.cc (modified) (5 diffs)
• SpaceRace.h (modified) (3 diffs)

code/trunk/src/modules/gametypes/RaceCheckPoint.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "util/Convert.h"
+
 #include "SpaceRace.h"
-#include "util/Convert.h"
 
 namespace orxonox
 {
     CreateFactory(RaceCheckPoint);
-    
+
     RaceCheckPoint::RaceCheckPoint(BaseObject* creator): DistanceTrigger(creator), RadarViewable(creator, static_cast<WorldEntity*>(this))
     {
@@ -50 +51 @@
         this->setRadarVisibility(false);
     }
-    
+
     RaceCheckPoint::~RaceCheckPoint()
     {
     }
-    
+
     void RaceCheckPoint::tick(float dt)
     {
@@ -60 +61 @@
 
         SpaceRace* gametype = orxonox_cast<SpaceRace*>(this->getGametype().get());
+        assert(gametype);
         if (this->getCheckpointIndex() == gametype->getCheckpointsReached())
             this->setRadarVisibility(true);
@@ -66 +68 @@
     }
 
-    
     void RaceCheckPoint::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
@@ -75 +76 @@
         XMLPortParam(RaceCheckPoint, "timelimit", setTimelimit, getTimeLimit, xmlelement, mode).defaultValues(0);
     }
-    
+
     void RaceCheckPoint::triggered(bool bIsTriggered)
     {
@@ -99 +100 @@
         }
     }
-    
+
     void RaceCheckPoint::setTimelimit(float timeLimit)
     {
@@ -115 +116 @@
         }
     }
-    
+
 }

code/trunk/src/modules/gametypes/RaceCheckPoint.h

@@ -34 +34 @@
 #include "objects/triggers/DistanceTrigger.h"
 #include "interfaces/RadarViewable.h"
-//#include <boost/concept_check.hpp>
 
 namespace orxonox
 {
-  /**
-  @brief
-    The RaceCheckPoint class enables the creation of a check point to use in a SpaceRace level.
-    !!! Don't forget to control the indexes of your check points and to set one last check point!!!
-  */
+    /**
+    @brief
+        The RaceCheckPoint class enables the creation of a check point to use in a SpaceRace level.
+        !!! Don't forget to control the indexes of your check points and to set one last check point!!!
+    */
     class _GametypesExport RaceCheckPoint : public DistanceTrigger, public RadarViewable
     {

code/trunk/src/modules/gametypes/SpaceRace.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "network/Host.h"
-#include <util/Clock.h>
-#include <util/Math.h>
 #include "util/Convert.h"
+#include "util/Math.h"
 
 namespace orxonox
 {
     CreateUnloadableFactory(SpaceRace);
-    
+
     SpaceRace::SpaceRace(BaseObject* creator) : Gametype(creator)
     {
         RegisterObject(SpaceRace);
-        this->bCheckpointsReached_ = 0;
+        this->checkpointsReached_ = 0;
         this->bTimeIsUp_ = false;
         this->numberOfBots_ = 0;
     }
-    
+
     void SpaceRace::end()
     {
         this->Gametype::end();
-          
+
         if (this->bTimeIsUp_)
         {
@@ -57 +56 @@
             int ms = this->clock_.getMilliseconds()-1000*s;
             const std::string& message = multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds !!\n"
-                        + "You didn't reach the check point " + multi_cast<std::string>(this->bCheckpointsReached_+1)
+                        + "You didn't reach the check point " + multi_cast<std::string>(this->checkpointsReached_+1)
                         + " before the time limit. You lose!";
             COUT(3) << message;
             const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
-            Host::Broadcast(message);
         }
         else
@@ -72 +70 @@
             COUT(3) << message << std::endl;
             const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
-            Host::Broadcast(message);
             float time = this->clock_.getSecondsPrecise();
             this->scores_.insert(time);
@@ -87 +84 @@
         std::string message("The match has started! Reach the check points as quickly as possible!");
         COUT(3) << message << std::endl;
-        Host::Broadcast(message);
+        const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
     }
-    
+
     void SpaceRace::newCheckpointReached()
     {
-        this->bCheckpointsReached_++;
+        this->checkpointsReached_++;
         this->clock_.capture();
         int s = this->clock_.getSeconds();
@@ -101 +98 @@
         COUT(3) << message;
         const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
-        Host::Broadcast(message);
     }
 

code/trunk/src/modules/gametypes/SpaceRace.h

@@ -30 +30 @@
 #define _SpaceRace_H__
 
+#include "gametypes/GametypesPrereqs.h"
+
+#include <set>
+#include <string>
+
+#include <util/Clock.h>
+
 #include "gametypes/Gametype.h"
-#include "gametypes/GametypesPrereqs.h"
+
 #include "RaceCheckPoint.h"
-#include <boost/concept_check.hpp>
-#include <util/Clock.h>
-#include <string.h>
-#include <set>
 
 namespace orxonox
@@ -47 +50 @@
     {
         friend class RaceCheckPoint;
-        
+
         public:
             SpaceRace(BaseObject* creator);
@@ -53 +56 @@
 
             virtual void start();
-                virtual void end();
+            virtual void end();
 
             virtual void newCheckpointReached();
 
             inline void setCheckpointsReached(int n)
-            { this->bCheckpointsReached_ = n;}
+                { this->checkpointsReached_ = n;}
             inline int getCheckpointsReached()
-            { return this->bCheckpointsReached_; }
+                { return this->checkpointsReached_; }
             inline void timeIsUp()
-            { this->bTimeIsUp_ = true;}
+                { this->bTimeIsUp_ = true;}
 
         protected:
 
         private:
-            int bCheckpointsReached_; //The current number of check points reached by the player.
+            int checkpointsReached_; //The current number of check points reached by the player.
             std::set<float> scores_; //The times of the players are saved in a set.
             bool bTimeIsUp_; //True if one of the check points is reached too late.