Changeset 9262 for code/trunk/src/modules/gametypes/SpaceRaceManager.cc

Timestamp:

Jun 2, 2012, 11:08:21 PM (12 years ago)

Author:

landauf

Message:

fixed bug in SpaceRaceManager - it used the wrong index to identify Checkpoints (the order in which they appear in the XML file instead of RaceCheckPoint::getCheckpointIndex())
+ some more cleanup

File:

• code/trunk/src/modules/gametypes/SpaceRaceManager.cc (modified) (5 diffs)

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

@@ -94 +94 @@
     }
 
-    int SpaceRaceManager::getIndex(RaceCheckPoint* checkpoint)
+    /**
+        @brief Returns the checkpoint with the given checkpoint-index (@see RaceCheckPoint::getCheckpointIndex).
+    */
+    RaceCheckPoint* SpaceRaceManager::findCheckpoint(int index) const
     {
         for (size_t i = 0; i < this->checkpoints_.size(); ++i)
-            if (this->checkpoints_[i] == checkpoint)
-                return i;
-
-        return -1;
+            if (this->checkpoints_[i]->getCheckpointIndex() == index)
+                return this->checkpoints_[i];
+        return 0;
     }
 
@@ -113 +115 @@
         if (index > -1)
         {
-            Vector3 v = this->getCheckpoint(index)->getNextcheckpoint();
+            Vector3 v = this->findCheckpoint(index)->getNextcheckpoint();
 
-            if (this->getCheckpoint(v.x) == check)
+            if (this->findCheckpoint(v.x) == check)
             {
                 reachedValidCheckpoint = true;
             }
-            if (this->getCheckpoint(v.y) == check)
+            if (this->findCheckpoint(v.y) == check)
             {
                 reachedValidCheckpoint = true;
             }
-            if (this->getCheckpoint(v.z) == check)
+            if (this->findCheckpoint(v.z) == check)
             {
                 reachedValidCheckpoint = true;
@@ -130 +132 @@
         else
         {
-            reachedValidCheckpoint = (this->getIndex(check) == 0);
+            reachedValidCheckpoint = (check->getCheckpointIndex() == 0);
         }
 
@@ -147 +149 @@
                         {
                 if (index > -1)
-                    this->setRadVis(player, false);
+                    this->setRadarVisibility(player, false);
                 else
-                    this->getCheckpoint(0)->setRadarVisibility(false);
+                    this->findCheckpoint(0)->setRadarVisibility(false);
 
                 gametype->newCheckpointReached(check, player);
-                this->setRadVis(player, true);
+                this->setRadarVisibility(player, true);
             }
         }
@@ -159 +161 @@
     }
 
-    void SpaceRaceManager::setRadVis(PlayerInfo* player, bool bVisible)
+    void SpaceRaceManager::setRadarVisibility(PlayerInfo* player, bool bVisible)
     {
         SpaceRace* gametype = orxonox_cast<SpaceRace*>(this->getGametype().get());
         assert(gametype);
         int index = gametype->getCheckpointReached(player);
-        Vector3 v = this->getCheckpoint(index)->getNextcheckpoint();
+        Vector3 v = this->findCheckpoint(index)->getNextcheckpoint();
 
         if (v.x > -1)
         {
-            this->getCheckpoint(v.x)->setRadarVisibility(bVisible);
-            this->getCheckpoint(v.x)->settingsChanged();
+            this->findCheckpoint(v.x)->setRadarVisibility(bVisible);
+            this->findCheckpoint(v.x)->settingsChanged();
         }
         if (v.y > -1)
         {
-            this->getCheckpoint(v.y)->setRadarVisibility(bVisible);
-            this->getCheckpoint(v.y)->settingsChanged();
+            this->findCheckpoint(v.y)->setRadarVisibility(bVisible);
+            this->findCheckpoint(v.y)->settingsChanged();
         }
         if (v.z > -1)
         {
-            this->getCheckpoint(v.z)->setRadarVisibility(bVisible);
-            this->getCheckpoint(v.z)->settingsChanged();
+            this->findCheckpoint(v.z)->setRadarVisibility(bVisible);
+            this->findCheckpoint(v.z)->settingsChanged();
         }
     }