[Orxonox-commit 4300] r8971 - in code/branches/spaceraceTwo: data/levels src/modules/gametypes

[jo at orxonox.net]

Author: jo
Date: 2011-12-13 23:20:20 +0100 (Tue, 13 Dec 2011)
New Revision: 8971

Modified:
   code/branches/spaceraceTwo/data/levels/Spacerace2.oxw
   code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc
Log:
Improved engine switching. Removed annoyance in the level.

Modified: code/branches/spaceraceTwo/data/levels/Spacerace2.oxw
===================================================================
--- code/branches/spaceraceTwo/data/levels/Spacerace2.oxw	2011-12-13 21:50:14 UTC (rev 8970)
+++ code/branches/spaceraceTwo/data/levels/Spacerace2.oxw	2011-12-13 22:20:20 UTC (rev 8971)
@@ -104,7 +104,7 @@
       </controller>
     </SpaceShip>
 
-    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff2 />
+    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
 
 
    

Modified: code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc
===================================================================
--- code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc	2011-12-13 21:50:14 UTC (rev 8970)
+++ code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc	2011-12-13 22:20:20 UTC (rev 8971)
@@ -101,7 +101,8 @@
         //TODO: switch the engine off/on via a short function  
         for(ObjectList<Engine>::iterator it = ObjectList<Engine>::begin(); it; ++it) 
         {
-            if(it->getMaxSpeedFront()>0)
+            it->setActive(false);
+            /*if(it->getMaxSpeedFront()>0)
             {
                 this->maxSpeedBack_=it->getMaxSpeedBack(); 
                 this->maxSpeedFront_=it->getMaxSpeedFront(); 
@@ -111,7 +112,7 @@
             it->setMaxSpeedBack(0); 
             it->setMaxSpeedFront(0); 
             it->setMaxSpeedLeftRight(0); 
-            it->setMaxSpeedUpDown(0); 
+            it->setMaxSpeedUpDown(0);*/ 
         } 
         this->addBots(this->numberOfBots_); 
     }
@@ -124,10 +125,11 @@
         {
             for(ObjectList<Engine>::iterator it = ObjectList<Engine>::begin(); it; ++it) 
             { 
-                it->setMaxSpeedBack(this->maxSpeedBack_); 
+                it->setActive(true);
+                /*it->setMaxSpeedBack(this->maxSpeedBack_); 
                 it->setMaxSpeedFront(this->maxSpeedFront_); 
                 it->setMaxSpeedLeftRight(this->maxSpeedLeftRight_); 
-                it->setMaxSpeedUpDown(this->maxSpeedUpDown_); 
+                it->setMaxSpeedUpDown(this->maxSpeedUpDown_);*/ 
             }
             this->cantMove_= false;