Changeset 8983 for code/branches

Timestamp:

Dec 14, 2011, 3:53:15 PM (13 years ago)

Author:

eceline

Message:

a few changes

Location:

code/branches/spaceraceTwo

Files:

• data/levels/Spacerace2.oxw (modified) (2 diffs)
• src/modules/gametypes/RaceCheckPoint.h (modified) (1 diff)
• src/modules/gametypes/SpaceRaceManager.cc (modified) (3 diffs)
• src/modules/gametypes/SpaceRaceManager.h (modified) (1 diff)
• src/orxonox/controllers/WaypointPatrolController.cc (modified) (2 diffs)

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

@@ -39 +39 @@
         <SpaceRaceManager>
 <checkpoints>   
-        <RaceCheckPoint name="checkpoint1" position="0,-2000,1000" direction="0,-1,1" collisionType="static" scale="1" distance="40" checkpointindex="0" islast="false" nextcheckpoints="1,2,0">
+        <RaceCheckPoint name="checkpoint1" position="0,-2000,1000" direction="0,-1,1" collisionType="static" scale="1" distance="40" checkpointindex="0" islast="false" nextcheckpoints="1,2,-1">
         <attached>
             <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
@@ -95 +95 @@
       </templates>
       <controller>
-        <WaypointPatrolController alertnessradius=1000 team=10>
+        <WaypointPatrolController alertnessradius=0 team=10>
           <waypoints>
             <Model mesh="cube.mesh" scale=0 position="0,-2000,1000" />

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

@@ -83 +83 @@
 
         private:
-            int bCheckpointIndex_; //The index of this check point.
+            int bCheckpointIndex_; //The index of this check point. The race starts with the check point with the index 0
             Vector3 nextcheckpoints_; //the indexes of the next check points
             

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

@@ -97 +97 @@
         {
             this->checkpoints_[0]->setRadarVisibility(true);
-            this->firstcheckpointvisible_=false;
+            this->firstcheckpointvisible_=true;
         }
          
@@ -153 +153 @@
                 gametype->end();
             else
-            {
+                                {
                 if (index > -1)this->setRadVis(player,false);
                         else this->getCheckpoint(0)->setRadarVisibility(false);
                 gametype->newCheckpointReached(check,player);
-                check->setRadarObjectColour(ColourValue::Green); //sets the radar colour of the checkpoint to green if it is reached, else it is red.
+               
                 
                 this->setRadVis(player, true);
@@ -187 +187 @@
         {
             this->getCheckpoint(v.z)->setRadarVisibility(b);
-            this->getCheckpoint(v.z)->settingsChanged();
+           this->getCheckpoint(v.z)->settingsChanged();
         }
+        
+        
     }
     

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

@@ -68 +68 @@
     
         protected:
-            void setRadVis(PlayerInfo* player, bool b);
+            void setRadVis(PlayerInfo* player, bool b);//sets RadarVisibility of the checkpoints the player can reach.
     
         private:
             std::vector<RaceCheckPoint*> checkpoints_;
-            bool firstcheckpointvisible_;
+            bool firstcheckpointvisible_;//true if the first check point is visible.
         
     };

code/branches/spaceraceTwo/src/orxonox/controllers/WaypointPatrolController.cc

@@ -78 +78 @@
 
     void WaypointPatrolController::searchEnemy()
-    {/*
+    {
         this->patrolTimer_.setInterval(rnd());
 
@@ -101 +101 @@
 
         if (shortestsqdistance > (this->alertnessradius_ * this->alertnessradius_))
-            this->target_ = 0;*/
+            this->target_ = 0;
     }
 }