Changeset 8968 for code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc

Timestamp:

Dec 8, 2011, 6:07:32 PM (12 years ago)

Author:

eceline

Message:

added waypoint patrol controller to level, RaceCheckPoint::fire works now

File:

• code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc (modified) (4 diffs)

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

@@ -29 +29 @@
 #include "SpaceRace.h"
 
-//#include "SpaceRaceManager.h"
 
 #include "items/Engine.h"
@@ -100 +99 @@
     void SpaceRace::start()
     {
-                //Gametype::start();
-                           this->spawnPlayersIfRequested(); Gametype::checkStart(); 
+                
+                           this->spawnPlayersIfRequested();
+                           
+                            Gametype::checkStart(); 
                            this->cantMove_=true; 
          
@@ -142 +143 @@
       
     }
-    // for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
-      //  {if(this->getCheckpointReached(it->first)==-1) orxout()<<"index -1"<<endl;}
+    
    
     }
 
-        void SpaceRace::setV(SpaceRaceManager* m){/*
-                Vector3 v =Vector3(0,0,0);
-        int j=0;
-        for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
-        {
-                j=this->getCheckpointReached(it->first);
-                RaceCheckPoint* r=m->getCheckpoint(j);
-                v=r->getNextcheckpoint();
-                for(int i=1;i<4;i++){
-                if(v[i]==0){
-                 RaceCheckPoint* n=m->getCheckpoint(v[i]);
-                 n->setV(true);
-                 }}
-        }*/
-        }
-
+        
+    
     void SpaceRace::newCheckpointReached(SpaceRaceManager* p, int index,PlayerInfo* pl)
-    {/*
-        this->checkpointReached_[pl]=index;
+            {
+                this->checkpointReached_[pl]=index;
         this->clock_.capture();
-        int s = this->clock_.getSeconds();
+                int s = this->clock_.getSeconds();
         int ms = static_cast<int>(this->clock_.getMilliseconds()-1000*s);
-        const std::string& message = "Checkpoint " + multi_cast<std::string>(index)
+                const std::string& message = "Checkpoint " + multi_cast<std::string>(index)
                         + " reached after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms)
-                        + " seconds.";
+                                + " seconds.";
         const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
         ChatManager::message(message);
-       */ 
-       
-    }
-    
+                       
+            }
+   
      void SpaceRace::newCheckpointReached(RaceCheckPoint* p, PlayerInfo* pl)
-    {   int index = p->getCheckpointIndex();
-        this->checkpointReached_[pl]=index;
-        this->clock_.capture();
-        int s = this->clock_.getSeconds();
-        int ms = static_cast<int>(this->clock_.getMilliseconds()-1000*s);
+            {   int index = p->getCheckpointIndex();
+                this->checkpointReached_[pl]=index;
+                this->clock_.capture();
+                int s = this->clock_.getSeconds();
+                int ms = static_cast<int>(this->clock_.getMilliseconds()-1000*s);
         const std::string& message = "Checkpoint " + multi_cast<std::string>(index)
-                        + " reached after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms)
+                                + " reached after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms)
                         + " seconds.";
-        const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
-        ChatManager::message(message);
-        
-       
-    }
+                const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
+                ChatManager::message(message);
+               
+               
+            }
+            
     
     
@@ -212 +198 @@
        // return valid_player;
         }
+        
+         bool SpaceRace::allowPawnHit(Pawn* victim, Pawn* originator)
+    {
+        return false;
+    }
+
+    bool SpaceRace::allowPawnDamage(Pawn* victim, Pawn* originator)
+    {
+        return false;
+    }
+
+    bool SpaceRace::allowPawnDeath(Pawn* victim, Pawn* originator)
+    {
+        return false;
+    }
 }