Changeset 9554 for code/branches

Timestamp:

Mar 17, 2013, 7:02:25 PM (12 years ago)

Author:

landauf

Message:

fixed some warnings

Location:

code/branches/core6/src

Files:

• modules/gametypes/RaceCheckPoint.cc (modified) (2 diffs)
• modules/gametypes/RaceCheckPoint.h (modified) (1 diff)
• modules/gametypes/SpaceRaceController.cc (modified) (4 diffs)
• orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)

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

@@ -157 +157 @@
         if (players_.size() > 0)
         {
-            for (int i = 0; i < players_.size(); i++)
+            for (size_t i = 0; i < players_.size(); i++)
             {
                 if (this->players_[i]->getClientID() == clientID)
@@ -172 +172 @@
         if (players_.size() > 0)
         {
-            for (int i = 0; i < players_.size(); i++)
+            for (size_t i = 0; i < players_.size(); i++)
             {
                 if (this->players_[i] == player)

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

@@ -70 +70 @@
             }
 
-            const std::set<int>& getNextCheckpoints()
+            std::set<int> getNextCheckpoints()
             {
                 return nextCheckpoints_;

code/branches/core6/src/modules/gametypes/SpaceRaceController.cc

@@ -86 +86 @@
 
         }//ausgabe*/
-
+        /*
         for (std::vector<RaceCheckPoint*>::iterator it = checkpoints.begin(); it != checkpoints.end(); ++it)
         {
@@ -100 +100 @@
                 }
             }
-        }/*
+        }
+        */
+        /*
         for(std::vector<RaceCheckPoint*>::iterator it=checkpoints_.begin(); it!=checkpoints_.end(); it++)
         {
@@ -301 +303 @@
     {
         for (size_t i = 0; i < this->checkpoints_.size(); ++i)
-        if (this->checkpoints_[i]->getCheckpointIndex() == index)
-        return this->checkpoints_[i];
+            if (this->checkpoints_[i]->getCheckpointIndex() == index)
+                return this->checkpoints_[i];
         return NULL;
     }
@@ -340 +342 @@
         //orxout()<<"temp nach ausgabe: "<<previousCheckpoint->getVirtualNextCheckpointsAsVector3().x<<previousCheckpoint->getVirtualNextCheckpointsAsVector3().y<<previousCheckpoint->getVirtualNextCheckpointsAsVector3().z<<endl;
         //OrxAssert(virtualCheckPointIndex < -1, "TO much virtual cp");
-        /*orxout()<<"id: "<< previousCheckpoint->getCheckpointIndex() <<", following:"<<indexFollowingCheckPoint<<" :       "<<temp.x<<", "<<temp.y<<", "<<temp.z<<";       ";
+        orxout()<<"id: "<< previousCheckpoint->getCheckpointIndex() <<", following:"<<indexFollowingCheckPoint<<" :       "<<temp.x<<", "<<temp.y<<", "<<temp.z<<";       ";
          temp=previousCheckpoint->getNextCheckpointsAsVector3();
          orxout()<<"id: "<< previousCheckpoint->getCheckpointIndex() <<":       "<<temp.x<<", "<<temp.y<<", "<<temp.z<<";       ";
-         orxout()<<endl;*//*
+         orxout()<<endl;
         return newTempRaceCheckPoint;
     }*/

code/branches/core6/src/orxonox/worldentities/pawns/Pawn.cc

@@ -98 +98 @@
 
         this->setSyncMode(ObjectDirection::Bidirectional); // needed to synchronise e.g. aimposition
-
-        /* sewper awesome optimization. This loads all the files required for
-         * the big explosion once in the beginning to make sure the game does
-         * not start lagging at the first in-action explosion.
-         */
-        BigExplosion *chunk = new BigExplosion(this->getCreator());
     }