Changeset 8630 for code/branches/spacerace/src/modules/gametypes/SpaceRace.cc

Timestamp:

May 27, 2011, 11:01:24 PM (13 years ago)

Author:

dafrick

Message:

Cleanup.

File:

• code/branches/spacerace/src/modules/gametypes/SpaceRace.cc (modified) (2 diffs)

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

@@ -41 +41 @@
     SpaceRace::SpaceRace(BaseObject* creator) : Gametype(creator)
     {
-        RegisterObject(SpaceRace);
-        this->bCheckpointsReached_ = 0;
-        this->bTimeIsUp_ = false;
-        this->numberOfBots_ = 0;
-    }
-    
-    void SpaceRace::tick(float dt)
-    {
-        Gametype::tick(dt);
+        RegisterObject(SpaceRace);
+        this->bCheckpointsReached_ = 0;
+        this->bTimeIsUp_ = false;
+        this->numberOfBots_ = 0;
     }
     
     void SpaceRace::end()
     {
-        Gametype::end();
-        if (this->bTimeIsUp_) {
-            this->clock_->capture();
-            int s = this->clock_->getSeconds();
-            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)
-                                         + " before the time limit. You lose!\n";
-            COUT(0) << message;
-            const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
-            Host::Broadcast(message);
-        }
-        else {
-            this->clock_->capture();
-            int s = this->clock_->getSeconds();
-            int ms = this->clock_->getMilliseconds()-1000*s;
-            const std::string& message = "You win!! You have reached the last check point after "+ multi_cast<std::string>(s)
-                                          + "." + multi_cast<std::string>(ms) + " seconds.\n";
-            COUT(0) << message << std::endl;
-            const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
-            Host::Broadcast(message);
-            float time = this->clock_->getSecondsPrecise();
-            this->scores_.insert(time);
-            std::set<float>::iterator it;
-            for (it=this->scores_.begin(); it!=this->scores_.end(); it++)
-            COUT(0) <<  multi_cast<std::string>(*it) << std::endl;
-        }
+        this->Gametype::end();
+          
+        if (this->bTimeIsUp_)
+        {
+            this->clock_.capture();
+            int s = this->clock_.getSeconds();
+            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)
+                        + " before the time limit. You lose!";
+            COUT(3) << message;
+            const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
+            Host::Broadcast(message);
+        }
+        else
+        {
+            this->clock_.capture();
+            int s = this->clock_.getSeconds();
+            int ms = this->clock_.getMilliseconds()-1000*s;
+            const std::string& message = "You win!! You have reached the last check point after "+ multi_cast<std::string>(s)
+                        + "." + multi_cast<std::string>(ms) + " seconds.";
+            COUT(3) << message << std::endl;
+            const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
+            Host::Broadcast(message);
+            float time = this->clock_.getSecondsPrecise();
+            this->scores_.insert(time);
+            std::set<float>::iterator it;
+            for (it=this->scores_.begin(); it!=this->scores_.end(); it++)
+            COUT(3) <<  multi_cast<std::string>(*it) << std::endl;
+        }
     }
 
     void SpaceRace::start()
     {
-        Gametype::start();
-        
-        clock_= new Clock();
-        std::string message("The match has started! Reach the check points as quickly as possible!");
-        COUT(0) << message << std::endl;
+        Gametype::start();
+
+        std::string message("The match has started! Reach the check points as quickly as possible!");
+        COUT(3) << message << std::endl;
         Host::Broadcast(message);
     }
@@ -95 +92 @@
     void SpaceRace::newCheckpointReached()
     {
-        this->bCheckpointsReached_++;
-        this->clock_->capture();
-        int s = this->clock_->getSeconds();
-        int ms = this->clock_->getMilliseconds()-1000*s;
-        const std::string& message = "Checkpoint " + multi_cast<std::string>(this->getCheckpointsReached()) 
-                                      + " reached after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms)
-                                      + " seconds.\n";
-        COUT(0) << message << std::endl;
-        const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
-        Host::Broadcast(message);
+        this->bCheckpointsReached_++;
+        this->clock_.capture();
+        int s = this->clock_.getSeconds();
+        int ms = this->clock_.getMilliseconds()-1000*s;
+        const std::string& message = "Checkpoint " + multi_cast<std::string>(this->getCheckpointsReached())
+                        + " reached after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms)
+                        + " seconds.\n";
+        COUT(3) << message;
+        const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
+        Host::Broadcast(message);
     }