Changeset 8949

Timestamp:

Nov 23, 2011, 4:16:15 PM (12 years ago)

Author:

eceline

Message:

level Spacerace2 works now

Location:

code/branches/spaceraceTwo

Files:

• data/levels/Spacerace2.oxw (modified) (1 diff)
• src/modules/gametypes/RaceCheckPoint.cc (modified) (3 diffs)
• src/modules/gametypes/SpaceRace.cc (modified) (6 diffs)
• src/modules/gametypes/SpaceRaceManager.cc (modified) (1 diff)
• src/orxonox/gametypes/Gametype.cc (modified) (6 diffs)
• src/orxonox/infos/GametypeInfo.cc (modified) (1 diff)

code/branches/spaceraceTwo/data/levels/Spacerace2.oxw

@@ -53 +53 @@
 </SpaceRaceManager>
 
-
+ <SpaceShip position="0,2000,2000" lookat="0,0,0" team=1 >
+      <templates>
+        <Template link=spaceshipassff />
+      </templates>
+      <controller>
+         <WaypointPatrolController alertnessradius=1500 team=0 >
+            <waypoints>
+                <Model scale=0 position="0,2000,2000" />
+            </waypoints>
+         </WaypointPatrolController>
+      </controller>
+    </SpaceShip>
 
 

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

@@ -39 +39 @@
 {
     CreateFactory(RaceCheckPoint);
+    
+      
 
     RaceCheckPoint::RaceCheckPoint(BaseObject* creator): DistanceTrigger(creator), RadarViewable(creator, static_cast<WorldEntity*>(this))
     {
         RegisterObject(RaceCheckPoint);
-
+        
+        
+           
         this->bCheckpointIndex_ = 0;
         //this->bIsLast_ = false;
         this->bTimeLimit_ = 0;
-        this->isVisible_=false;
+        this->isVisible_=true;
 
         this->setRadarObjectColour(ColourValue::Blue);
         this->setRadarObjectShape(RadarViewable::Triangle);
-        this->setRadarVisibility(false);
+        this->setRadarVisibility(true);
     }
 
@@ -58 +62 @@
          //if (this->isInitialized())
         {
-            //for (size_t i = 0; i < this->nextcheckpoints_.size(); ++i)
-              //  this->nextcheckpoints_[i]->destroy();
+            //for (size_t i = 0; i < 3; ++i)
+            //   this->nextcheckpoints_[i]->destroy();
         }
        //nextcheckpoints_.destroy;
@@ -72 +76 @@
         if(this->isVisible_){this->setRadarVisibility(true);}
         else{this->setRadarVisibility(false);}
+       
+       
         /*this->setRadarVisibility(false);
         Vector3 v =Vector3(0,0,0);

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

@@ -46 +46 @@
         RegisterObject(SpaceRace);
         
-         const std::string& message = "SpaceRace constructed";
-         orxout()<< message << endl;
+        
     
         this->bTimeIsUp_ = false;
         this->numberOfBots_ = 0;
         this->cantMove_=false;
+        
         
        for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
@@ -97 +97 @@
 
     void SpaceRace::start()
-    { 
-                Gametype::start();
-                           this->spawnPlayersIfRequested(); //Gametype::checkStart(); 
+    {
+                //Gametype::start();
+                           this->spawnPlayersIfRequested(); Gametype::checkStart(); 
                            this->cantMove_=true; 
          
@@ -117 +117 @@
                                
                                this->addBots(this->numberOfBots_); 
-       
+      
     }
     
@@ -144 +144 @@
 
         void SpaceRace::setV(SpaceRaceManager* m){
-                Vector3 v =Vector3(0,0,0);
+                /*Vector3 v =Vector3(0,0,0);
         int j=0;
         for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
@@ -152 +152 @@
                 v=r->getNextcheckpoint();
                 for(int i=1;i<4;i++){
-                 RaceCheckPoint* n=m->getCheckpoint(i);
+                if(v[i]==0){
+                 RaceCheckPoint* n=m->getCheckpoint(v[i]);
                  n->setV(true);
-                 }
-        }
+                 }}
+        }*/
         }
 
@@ -191 +192 @@
 
 void SpaceRace::playerEntered(PlayerInfo* player){
-        this->checkpointReached_[player]=0;
-        this->playersAlive_++;
+        Gametype::playerEntered(player);
+        //this->checkpointReached_[player]=0;
+        //this->playersAlive_++;
     }
     
         bool SpaceRace::playerLeft(PlayerInfo* player){
-                 bool valid_player = true;
-        if (valid_player)
-        {
-            this->playersAlive_--;
-        }
-
-        return valid_player;
+        return Gametype::playerLeft(player);
+                // bool valid_player = true;
+        //if (valid_player)
+       // {
+        //    this->playersAlive_--;
+        //}
+
+       // return valid_player;
         }
 }

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

@@ -46 +46 @@
         RegisterObject(SpaceRaceManager);
          
-          const std::string& message = "SpaceRaceManager constructed";
-         orxout()<< message << endl;      
+          
     }
 

code/branches/spaceraceTwo/src/orxonox/gametypes/Gametype.cc

@@ -134 +134 @@
                 
             }
-            
-             const std::string& message = "Gametype should start";
-         orxout()<< message << endl;    
-                this->start();
-                const std::string& message2 = "Gametype should have started";
-         orxout()<< message2 << endl;
+              
+                this->checkStart();
+           
          
         }
@@ -149 +146 @@
 
     void Gametype::start()
-    { const std::string& message = "Gametype starts";
-         orxout()<< message << endl;
+    {
          
         this->addBots(this->numberOfBots_);
@@ -158 +154 @@
         this->spawnPlayersIfRequested();
         
-         
+        
     }
 
@@ -387 +383 @@
                 {
                     this->gtinfo_->stopStartCountdown();
-                    this->gtinfo_->setStartCountdown(0.0f);;
+                    this->gtinfo_->setStartCountdown(0.0f);
                     this->start();
                 }
@@ -408 +404 @@
                             hashumanplayers = true;
                     }
+                         
                     if (allplayersready && hashumanplayers)
                     {
@@ -419 +416 @@
                 }
             }
+            
         }
     }

code/branches/spaceraceTwo/src/orxonox/infos/GametypeInfo.cc

@@ -164 +164 @@
     {
         if(this->bStarted_)
-           {const std::string& message = "bStarted true";
-         orxout()<< message << endl; return;}
+           { return;}
         
         this->bStarted_ = true;
         this->changedStarted();
         
-        const std::string& message = "bStarted true";
-         orxout()<< message << endl;
+       
     }