Changeset 6935 for code/branches/presentation3/src

Timestamp:

May 20, 2010, 2:50:59 PM (15 years ago)

Author:

dafrick

Message:

Some changed in a level also in Triggers…

Location:

code/branches/presentation3/src

Files:

• modules/objects/triggers/DistanceTrigger.cc (modified) (1 diff)
• modules/questsystem/QuestEffectBeacon.cc (modified) (1 diff)
• orxonox/gametypes/TeamDeathmatch.cc (modified) (2 diffs)

code/branches/presentation3/src/modules/objects/triggers/DistanceTrigger.cc

@@ -155 +155 @@
       }
     }
+
     return false;
   }

code/branches/presentation3/src/modules/questsystem/QuestEffectBeacon.cc

@@ -134 +134 @@
         if(pawn == NULL)
         {
-            COUT(2) << "The QuestEffectBeacon was triggered by an entity other than a Pawn." << std::endl;
+            COUT(2) << "The QuestEffectBeacon was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
             return false;
         }

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

@@ -138 +138 @@
 
         SpawnPoint* fallbackSpawnPoint = NULL;
-
         if (teamSpawnPoints.size() > 0)
         {
             unsigned int randomspawn = static_cast<unsigned int>(rnd(static_cast<float>(teamSpawnPoints.size())));
             unsigned int index = 0;
+            // Get random fallback spawnpoint in case there is no active SpawnPoint.
             for (std::set<SpawnPoint*>::const_iterator it = teamSpawnPoints.begin(); it != teamSpawnPoints.end(); ++it)
             {
@@ -154 +154 @@
             }
 
+            // Remove all inactive SpawnPoints from the list.
             for (std::set<SpawnPoint*>::const_iterator it = teamSpawnPoints.begin(); it != teamSpawnPoints.end(); )
             {
-                if (!(*it)->isActive())
-                {
-                    COUT(1) << "MUP" << std::endl;
+                if(!(*it)->isActive())
+                {
+                    COUT(1) << (*it)->getName() << " is inactive." << std::endl;
                     teamSpawnPoints.erase(it++);
                     continue;
                 }
+                COUT(1) << (*it)->getName() << " is active." << std::endl;
 
                 ++it;
             }
+
+            COUT(1) << "MUP " << teamSpawnPoints.size() << std::endl;
 
             randomspawn = static_cast<unsigned int>(rnd(static_cast<float>(teamSpawnPoints.size())));