Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8983 for code/branches


Ignore:
Timestamp:
Dec 14, 2011, 3:53:15 PM (13 years ago)
Author:
eceline
Message:

a few changes

Location:
code/branches/spaceraceTwo
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • code/branches/spaceraceTwo/data/levels/Spacerace2.oxw

    r8979 r8983  
    3939        <SpaceRaceManager>
    4040<checkpoints>   
    41         <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">
     41        <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">
    4242        <attached>
    4343            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
     
    9595      </templates>
    9696      <controller>
    97         <WaypointPatrolController alertnessradius=1000 team=10>
     97        <WaypointPatrolController alertnessradius=0 team=10>
    9898          <waypoints>
    9999            <Model mesh="cube.mesh" scale=0 position="0,-2000,1000" />
  • code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.h

    r8979 r8983  
    8383
    8484        private:
    85             int bCheckpointIndex_; //The index of this check point.
     85            int bCheckpointIndex_; //The index of this check point. The race starts with the check point with the index 0
    8686            Vector3 nextcheckpoints_; //the indexes of the next check points
    8787           
  • code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.cc

    r8979 r8983  
    9797        {
    9898            this->checkpoints_[0]->setRadarVisibility(true);
    99             this->firstcheckpointvisible_=false;
     99            this->firstcheckpointvisible_=true;
    100100        }
    101101         
     
    153153                gametype->end();
    154154            else
    155             {
     155                                {
    156156                if (index > -1)this->setRadVis(player,false);
    157157                        else this->getCheckpoint(0)->setRadarVisibility(false);
    158158                gametype->newCheckpointReached(check,player);
    159                 check->setRadarObjectColour(ColourValue::Green); //sets the radar colour of the checkpoint to green if it is reached, else it is red.
     159               
    160160               
    161161                this->setRadVis(player, true);
     
    187187        {
    188188            this->getCheckpoint(v.z)->setRadarVisibility(b);
    189             this->getCheckpoint(v.z)->settingsChanged();
     189           this->getCheckpoint(v.z)->settingsChanged();
    190190        }
     191       
     192       
    191193    }
    192194   
  • code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.h

    r8970 r8983  
    6868   
    6969        protected:
    70             void setRadVis(PlayerInfo* player, bool b);
     70            void setRadVis(PlayerInfo* player, bool b);//sets RadarVisibility of the checkpoints the player can reach.
    7171   
    7272        private:
    7373            std::vector<RaceCheckPoint*> checkpoints_;
    74             bool firstcheckpointvisible_;
     74            bool firstcheckpointvisible_;//true if the first check point is visible.
    7575       
    7676    };
  • code/branches/spaceraceTwo/src/orxonox/controllers/WaypointPatrolController.cc

    r8968 r8983  
    7878
    7979    void WaypointPatrolController::searchEnemy()
    80     {/*
     80    {
    8181        this->patrolTimer_.setInterval(rnd());
    8282
     
    101101
    102102        if (shortestsqdistance > (this->alertnessradius_ * this->alertnessradius_))
    103             this->target_ = 0;*/
     103            this->target_ = 0;
    104104    }
    105105}
Note: See TracChangeset for help on using the changeset viewer.