[Orxonox-commit 4885] r9554 - in code/branches/core6/src: modules/gametypes orxonox/worldentities/pawns

[landauf at orxonox.net]

Author: landauf
Date: 2013-03-17 19:02:25 +0100 (Sun, 17 Mar 2013)
New Revision: 9554

Modified:
   code/branches/core6/src/modules/gametypes/RaceCheckPoint.cc
   code/branches/core6/src/modules/gametypes/RaceCheckPoint.h
   code/branches/core6/src/modules/gametypes/SpaceRaceController.cc
   code/branches/core6/src/orxonox/worldentities/pawns/Pawn.cc
Log:
fixed some warnings

Modified: code/branches/core6/src/modules/gametypes/RaceCheckPoint.cc
===================================================================
--- code/branches/core6/src/modules/gametypes/RaceCheckPoint.cc	2013-03-17 16:26:13 UTC (rev 9553)
+++ code/branches/core6/src/modules/gametypes/RaceCheckPoint.cc	2013-03-17 18:02:25 UTC (rev 9554)
@@ -156,7 +156,7 @@
     {
         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)
                 {
@@ -171,7 +171,7 @@
     {
         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)
                 {

Modified: code/branches/core6/src/modules/gametypes/RaceCheckPoint.h
===================================================================
--- code/branches/core6/src/modules/gametypes/RaceCheckPoint.h	2013-03-17 16:26:13 UTC (rev 9553)
+++ code/branches/core6/src/modules/gametypes/RaceCheckPoint.h	2013-03-17 18:02:25 UTC (rev 9554)
@@ -69,7 +69,7 @@
                 return this->nextCheckpointsVirtual_;
             }
 
-            const std::set<int>& getNextCheckpoints()
+            std::set<int> getNextCheckpoints()
             {
                 return nextCheckpoints_;
                 std::set<int> temp;

Modified: code/branches/core6/src/modules/gametypes/SpaceRaceController.cc
===================================================================
--- code/branches/core6/src/modules/gametypes/SpaceRaceController.cc	2013-03-17 16:26:13 UTC (rev 9553)
+++ code/branches/core6/src/modules/gametypes/SpaceRaceController.cc	2013-03-17 18:02:25 UTC (rev 9554)
@@ -85,7 +85,7 @@
             orxout()<<endl<<endl;
 
         }//ausgabe*/
-
+        /*
         for (std::vector<RaceCheckPoint*>::iterator it = checkpoints.begin(); it != checkpoints.end(); ++it)
         {
             std::set<int> nextCheckPoints = ((*it)->getNextCheckpoints());
@@ -99,7 +99,9 @@
                     //placeVirtualCheckpoints((*it), point2);
                 }
             }
-        }/*
+        }
+        */
+        /*
         for(std::vector<RaceCheckPoint*>::iterator it=checkpoints_.begin(); it!=checkpoints_.end(); it++)
         {
             orxout()<<"Checkpoint "<<(*it)->getCheckpointIndex()<<"; NExtReal: ";
@@ -300,8 +302,8 @@
     RaceCheckPoint* SpaceRaceController::findCheckpoint(int index) const
     {
         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;
     }
 
@@ -339,10 +341,10 @@
         //orxout()<<"temp bei 1: ="<< temp.x<< temp.y<< temp.z<<endl;
         //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;
     }*/
 

Modified: code/branches/core6/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/core6/src/orxonox/worldentities/pawns/Pawn.cc	2013-03-17 16:26:13 UTC (rev 9553)
+++ code/branches/core6/src/orxonox/worldentities/pawns/Pawn.cc	2013-03-17 18:02:25 UTC (rev 9554)
@@ -97,12 +97,6 @@
         this->isHumanShip_ = this->hasLocalController();
 
         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());
     }
 
     Pawn::~Pawn()