Changeset 9964 for code/trunk/src/modules/gametypes/RaceCheckPoint.cc

Timestamp:

Jan 3, 2014, 9:44:23 PM (12 years ago)

Author:

landauf

Message:

removed unused code (some of the code was after a 'return' statement and thus never executed)

File:

• code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) (3 diffs)

code/trunk/src/modules/gametypes/RaceCheckPoint.cc

@@ -104 +104 @@
     }
 
-    //Must not be called before setNextCheckpointsAsVector3 at least once has been called
-    void RaceCheckPoint::setNextVirtualCheckpointsAsVector3(const Vector3& checkpoints){
-        /*std::set<int> lastcheckpoints=this->nextCheckpoints_;
-        nextCheckpoints_.clear();
-        std::set<int>::iterator it = lastcheckpoints.begin();
-        if(checkpoints.x<-1){
-            virtualToRealCheckPoints_.insert(std::pair<int,int>(checkpoints.x,(*it)));
-            it++;
-        }
-        if(checkpoints.x!=-1)
-            this->nextCheckpoints_.insert(static_cast<int>(checkpoints.x + 0.5)); // the red number has the type double and for the cast (to int) is added 0.5 so that the cast works correctly
-
-        if(checkpoints.y<-1){
-                    virtualToRealCheckPoints_.insert(std::pair<int,int>(checkpoints.y,(*it)));
-                    it++;
-        }
-        if(checkpoints.y!=-1)
-            this->nextCheckpoints_.insert(static_cast<int>(checkpoints.y + 0.5));
-
-        if(checkpoints.z<-1){
-                    virtualToRealCheckPoints_.insert(std::pair<int,int>(checkpoints.z,(*it)));
-                    it++;
-        }
-        if(checkpoints.z!=-1)
-            this->nextCheckpoints_.insert(static_cast<int>(checkpoints.z + 0.5));*/
-        nextCheckpointsVirtual_.clear();
-        if(checkpoints.x!=-1)
-            nextCheckpointsVirtual_.insert(checkpoints.x);
-        if(checkpoints.y!=-1)
-                nextCheckpointsVirtual_.insert(checkpoints.y);
-        if(checkpoints.z!=-1)
-                nextCheckpointsVirtual_.insert(checkpoints.z);
-    }
-
     void RaceCheckPoint::setNextCheckpointsAsVector3(const Vector3& checkpoints)
     {
@@ -148 +114 @@
         if (checkpoints.z > -1)
         this->nextCheckpoints_.insert(static_cast<int>(checkpoints.z + 0.5));
-
-        this->nextCheckpointsVirtual_=nextCheckpoints_;
     }
 
@@ -195 +159 @@
         }
         return checkpoints;
-        //= getVirtualNextCheckpointsAsVector3();
-        int j[3];
-        j[0]=changeVirtualToRealCheckPoint(checkpoints.x);
-        j[1]=changeVirtualToRealCheckPoint(checkpoints.y);
-        j[2]=changeVirtualToRealCheckPoint(checkpoints.z);
-
-
-        return Vector3(j[0],j[1],j[2]);
-
-
     }
 
-    int RaceCheckPoint::changeVirtualToRealCheckPoint(int checkpointID) {
-        int temp=checkpointID;
-        while(temp<-1){
-            temp = this->virtualToRealCheckPoints_[temp];
-        }
-        return temp;
-    }
-
-
-    Vector3 RaceCheckPoint::getVirtualNextCheckpointsAsVector3() const
-    {
-        Vector3 checkpoints = Vector3(-1, -1, -1);
-
-        size_t count = 0;
-        for (std::set<int>::iterator it = this->nextCheckpointsVirtual_.begin(); it != this->nextCheckpointsVirtual_.end(); ++it)
-        {
-            switch (count)
-            {
-                case 0: checkpoints.x = static_cast<Ogre::Real>(*it); break;
-                case 1: checkpoints.y = static_cast<Ogre::Real>(*it); break;
-                case 2: checkpoints.z = static_cast<Ogre::Real>(*it); break;
-            }
-            ++count;
-        }
-
-        return checkpoints;
-    }
 }