Changeset 6920 for code/branches/presentation3

Timestamp:

May 17, 2010, 4:57:26 PM (14 years ago)

Author:

stmathia

Message:

Changes in level files. Addition to TemaDeathmatch, should now be able to only use active SpawnPoints (at least if there are active ones), not fully working, yet, though.

Location:

code/branches/presentation3

Files:

• data/levels/Level(Deathmatch).oxw (added)
• data/levels/Level(UnderAttack).oxw (added)
• data/levels/mylevel.oxw (added)
• src/orxonox/gametypes/TeamDeathmatch.cc (modified) (2 diffs)

code/branches/presentation3/src/orxonox/gametypes/TeamDeathmatch.cc

@@ -137 +137 @@
         }
 
+        SpawnPoint* fallbackSpawnPoint = NULL;
+
         if (teamSpawnPoints.size() > 0)
         {
@@ -144 +146 @@
             {
                 if (index == randomspawn)
+                {
+                    fallbackSpawnPoint = (*it);
+                    break;
+                }
+
+                ++index;
+            }
+
+            for (std::set<SpawnPoint*>::const_iterator it = teamSpawnPoints.begin(); it != teamSpawnPoints.end(); )
+            {
+                if (!(*it)->isActive())
+                {
+                    COUT(1) << "MUP" << std::endl;
+                    teamSpawnPoints.erase(it++);
+                    continue;
+                }
+
+                ++it;
+            }
+
+            randomspawn = static_cast<unsigned int>(rnd(static_cast<float>(teamSpawnPoints.size())));
+            index = 0;
+            for (std::set<SpawnPoint*>::const_iterator it = teamSpawnPoints.begin(); it != teamSpawnPoints.end(); ++it)
+            {
+                if (index == randomspawn)
                     return (*it);
 
                 ++index;
             }
+
+            return fallbackSpawnPoint;
         }