Changeset 9962 for code/trunk

Timestamp:

Jan 3, 2014, 9:28:38 PM (11 years ago)

Author:

landauf

Message:

fixed warnings (msvc)

Location:

code/trunk/src/modules/gametypes

Files:

• SpaceRaceController.cc (modified) (6 diffs)
• SpaceRaceController.h (modified) (1 diff)

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

@@ -207 +207 @@
     // functions for dynamic Way-search
 
-    int SpaceRaceController::distanceSpaceshipToCheckPoint(RaceCheckPoint* CheckPoint)
+    float SpaceRaceController::distanceSpaceshipToCheckPoint(RaceCheckPoint* CheckPoint)
     {
         if (this->getControllableEntity() != NULL)
@@ -222 +222 @@
     RaceCheckPoint* SpaceRaceController::nextPointFind(RaceCheckPoint* raceCheckpoint)
     {
-        int distances[] = {-1, -1, -1};
+        float distances[] = {-1, -1, -1};
         int temp_i = 0;
         for (std::set<int>::iterator it =raceCheckpoint->getVirtualNextCheckpoints().begin(); it!= raceCheckpoint->getVirtualNextCheckpoints().end(); ++it)
@@ -229 +229 @@
             temp_i++;
         }
-        if (distances[0] > distances[1] && distances[1] != -1)
-        {
-            if (distances[2] < distances[1] && distances[2] != -1)
+        if (distances[0] > distances[1] && distances[1] >= 0)
+        {
+            if (distances[2] < distances[1] && distances[2] >= 0)
             {
                 return findCheckpoint(*raceCheckpoint->getVirtualNextCheckpoints().end()); // return checkpoint with ID of raceCheckpoint->getNextCheckpoints() [2]
@@ -243 +243 @@
         else
         {
-            if (distances[2] < distances[0] && distances[2] != -1)
+            if (distances[2] < distances[0] && distances[2] >= 0)
             {
                 return findCheckpoint(*raceCheckpoint->getVirtualNextCheckpoints().end()); // return [2]
@@ -258 +258 @@
      * returns the distance between "currentPosition" and the next static checkpoint that can be reached from "currentCheckPoint"
      */
-    int SpaceRaceController::recCalculateDistance(RaceCheckPoint* currentCheckPoint, Vector3 currentPosition)
+    float SpaceRaceController::recCalculateDistance(RaceCheckPoint* currentCheckPoint, Vector3 currentPosition)
     {
         // find: looks if the currentCheckPoint is a staticCheckPoint (staticCheckPoint is the same as: static Point)
@@ -267 +267 @@
         else
         {
-            int minimum = std::numeric_limits<int>::max();
+            float minimum = std::numeric_limits<float>::max();
             for (std::set<int>::iterator it = currentCheckPoint->getVirtualNextCheckpoints().begin(); it != currentCheckPoint->getVirtualNextCheckpoints().end(); ++it)
             {

code/trunk/src/modules/gametypes/SpaceRaceController.h

@@ -47 +47 @@
             int virtualCheckPointIndex;
 
-            int recCalculateDistance(RaceCheckPoint*, Vector3 currentPosition);
-            int distanceSpaceshipToCheckPoint(RaceCheckPoint*);
+            float recCalculateDistance(RaceCheckPoint*, Vector3 currentPosition);
+            float distanceSpaceshipToCheckPoint(RaceCheckPoint*);
             RaceCheckPoint* nextPointFind(RaceCheckPoint*);
             RaceCheckPoint* adjustNextPoint();