Changeset 8631

Timestamp:

May 27, 2011, 11:09:00 PM (13 years ago)

Author:

dafrick

Message:

Merging spacerace branch into presentation branch.

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• data/levels/spaceRace.oxw (copied) (copied from code/branches/spacerace/data/levels/spaceRace.oxw)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/gametypes (copied) (copied from code/branches/spacerace/src/modules/gametypes)
• src/modules/gametypes/CMakeLists.txt (copied) (copied from code/branches/spacerace/src/modules/gametypes/CMakeLists.txt)
• src/modules/gametypes/GametypesPrecompiledHeaders.h (copied) (copied from code/branches/spacerace/src/modules/gametypes/GametypesPrecompiledHeaders.h)
• src/modules/gametypes/GametypesPrereqs.h (copied) (copied from code/branches/spacerace/src/modules/gametypes/GametypesPrereqs.h)
• src/modules/gametypes/RaceCheckPoint.cc (copied) (copied from code/branches/spacerace/src/modules/gametypes/RaceCheckPoint.cc)
• src/modules/gametypes/RaceCheckPoint.h (copied) (copied from code/branches/spacerace/src/modules/gametypes/RaceCheckPoint.h)
• src/modules/gametypes/SpaceRace.cc (copied) (copied from code/branches/spacerace/src/modules/gametypes/SpaceRace.cc)
• src/modules/gametypes/SpaceRace.h (copied) (copied from code/branches/spacerace/src/modules/gametypes/SpaceRace.h)
• src/orxonox/gametypes/Gametype.cc (modified) (2 diffs)

code/branches/presentation/src/modules/CMakeLists.txt

@@ -27 +27 @@
 
 ADD_SUBDIRECTORY(designtools)
+ADD_SUBDIRECTORY(gametypes)
 ADD_SUBDIRECTORY(notifications)
 ADD_SUBDIRECTORY(objects)

code/branches/presentation/src/orxonox/gametypes/Gametype.cc

@@ -306 +306 @@
     SpawnPoint* Gametype::getBestSpawnPoint(PlayerInfo* player) const
     {
+        // If there is at least one SpawnPoint.
         if (this->spawnpoints_.size() > 0)
         {
+            // Fallback spawn point if there is no active one, choose a random one.
             SpawnPoint* fallbackSpawnPoint = NULL;
             unsigned int randomspawn = static_cast<unsigned int>(rnd(static_cast<float>(this->spawnpoints_.size())));
             unsigned int index = 0;
-            std::set<SpawnPoint*> activeSpawnPoints = this->spawnpoints_;
+            std::vector<SpawnPoint*> activeSpawnPoints;
             for (std::set<SpawnPoint*>::const_iterator it = this->spawnpoints_.begin(); it != this->spawnpoints_.end(); ++it)
             {
@@ -317 +319 @@
                     fallbackSpawnPoint = (*it);
 
-                if (!(*it)->isActive())
-                    activeSpawnPoints.erase(*it);
+                if (*it != NULL && (*it)->isActive())
+                    activeSpawnPoints.push_back(*it);
 
                 ++index;
             }
 
-            randomspawn = static_cast<unsigned int>(rnd(static_cast<float>(this->spawnpoints_.size())));
-            index = 0;
-            for (std::set<SpawnPoint*>::const_iterator it = activeSpawnPoints.begin(); it != activeSpawnPoints.end(); ++it)
-            {
-                if (index == randomspawn)
-                    return (*it);
-
-                ++index;
-            }
-
+            if(activeSpawnPoints.size() > 0)
+            {
+                randomspawn = static_cast<unsigned int>(rnd(static_cast<float>(activeSpawnPoints.size())));
+                return activeSpawnPoints[randomspawn];
+            }
+
+            COUT(2) << "Warning: Fallback SpawnPoint was used, because there were no active SpawnPoints." << endl;
             return fallbackSpawnPoint;
         }