Changeset 8971 for code/branches

Timestamp:

Dec 13, 2011, 11:20:20 PM (13 years ago)

Author:

jo

Message:

Improved engine switching. Removed annoyance in the level.

Location:

code/branches/spaceraceTwo

Files:

• data/levels/Spacerace2.oxw (modified) (1 diff)
• src/modules/gametypes/SpaceRace.cc (modified) (3 diffs)

code/branches/spaceraceTwo/data/levels/Spacerace2.oxw

@@ -105 +105 @@
     </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 />
 
 

code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc

@@ -102 +102 @@
         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(); 
@@ -112 +113 @@
             it->setMaxSpeedFront(0); 
             it->setMaxSpeedLeftRight(0); 
-            it->setMaxSpeedUpDown(0); 
+            it->setMaxSpeedUpDown(0);*/ 
         } 
         this->addBots(this->numberOfBots_); 
@@ -125 +126 @@
             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;