[Orxonox-commit 2308] r7023 - in code/branches/presentation3: data/levels src/orxonox/gametypes

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-05-30 16:36:43 +0200 (Sun, 30 May 2010)
New Revision: 7023

Modified:
   code/branches/presentation3/data/levels/gametype_asteroids.oxw
   code/branches/presentation3/src/orxonox/gametypes/TeamDeathmatch.cc
Log:
Made gametype_asteroids level easier to play and erased some debug output in TeamDeathmatch.


Modified: code/branches/presentation3/data/levels/gametype_asteroids.oxw
===================================================================
--- code/branches/presentation3/data/levels/gametype_asteroids.oxw	2010-05-30 14:09:45 UTC (rev 7022)
+++ code/branches/presentation3/data/levels/gametype_asteroids.oxw	2010-05-30 14:36:43 UTC (rev 7023)
@@ -142,10 +142,10 @@
     </ForceField>
 
 
-    <CheckPoint name=trigger1 position="-300,300,0" scale=1 isdestination=false isfirst=true stayactive=true distance=10 addtime=13 />
+    <CheckPoint name=trigger1 position="-300,300,0" scale=1 isdestination=false isfirst=true stayactive=true distance=10 addtime=26 />
 
 
-    <CheckPoint name=trigger2 position="2200,600,0" scale=3 isdestination=false stayactive=true distance=100 addtime=10>
+    <CheckPoint name=trigger2 position="2200,600,0" scale=3 isdestination=false stayactive=true distance=100 addtime=20>
       <events>
         <activity>
           <EventListener event=trigger1 />
@@ -196,7 +196,7 @@
     </CheckPoint>
 
 
-    <CheckPoint name=trigger3 position="4100,0,400" scale=3 isdestination=false stayactive=true distance=100 addtime=9>
+    <CheckPoint name=trigger3 position="4100,0,400" scale=3 isdestination=false stayactive=true distance=100 addtime=18>
       <events>
         <activity>
           <EventListener event=trigger2 />
@@ -247,7 +247,7 @@
     </CheckPoint>
 
 
-    <CheckPoint name=trigger4 position="5600,400,0" scale=3 isdestination=false stayactive=true distance=100 addtime=9>
+    <CheckPoint name=trigger4 position="5600,400,0" scale=3 isdestination=false stayactive=true distance=100 addtime=18>
       <events>
         <activity>
           <EventListener event=trigger3 />
@@ -298,7 +298,7 @@
     </CheckPoint>
 
 
-    <CheckPoint name=trigger5 position="7200,600,-200" scale=3 isdestination=false stayactive=true distance=100 addtime=8>
+    <CheckPoint name=trigger5 position="7200,600,-200" scale=3 isdestination=false stayactive=true distance=100 addtime=18>
       <events>
         <activity>
           <EventListener event=trigger4 />
@@ -349,7 +349,7 @@
     </CheckPoint>
 
 
-    <CheckPoint name=trigger6 position="9200, 800,-800" scale=3 isdestination=false stayactive=true distance=100 addtime=10>
+    <CheckPoint name=trigger6 position="9200, 800,-800" scale=3 isdestination=false stayactive=true distance=100 addtime=20>
       <events>
         <activity>
           <EventListener event=trigger5 />

Modified: code/branches/presentation3/src/orxonox/gametypes/TeamDeathmatch.cc
===================================================================
--- code/branches/presentation3/src/orxonox/gametypes/TeamDeathmatch.cc	2010-05-30 14:09:45 UTC (rev 7022)
+++ code/branches/presentation3/src/orxonox/gametypes/TeamDeathmatch.cc	2010-05-30 14:36:43 UTC (rev 7023)
@@ -158,17 +158,13 @@
             {
                 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())));
             index = 0;
             for (std::set<SpawnPoint*>::const_iterator it = teamSpawnPoints.begin(); it != teamSpawnPoints.end(); ++it)