Changeset 9615

Timestamp:

Apr 23, 2013, 1:42:53 PM (12 years ago)

Author:

maxima

Message:

If the HumanController dies but had slaves,
then the Controller changes to one of his slaves

Location:

code/branches/formationupdate

Files:

• data/levels/maxim.oxw (modified) (3 diffs)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)

code/branches/formationupdate/data/levels/maxim.oxw

@@ -65 +65 @@
 
         <!-- ADDING FORMATION: 5 Swallows -->
-        <?lua for i=0,4,1 do
+        <?lua for i=0,1,1 do
         ?>
-            <SpaceShip position="<?lua print(400+i*200) ?>,-200,1000" lookat="-1300,-600,900" visible="true">
+            <SpaceShip position="<?lua print(800+i*200) ?>,700,600" lookat="-1300,-600,900" visible="true">
                 <templates>
                     <Template link=spaceshipswallow /> 
@@ -79 +79 @@
         
         <!-- ADDING ENEMY FORMATION: 5 Swallows -->
-        <!--
-        <?lua for i=0,4,1 do
+
+        <?lua for i=0,1,1 do
         ?>
             <SpaceShip position="<?lua print(5000+i*200) ?>,-200,1000" lookat="-1300,-600,900" visible="true">
@@ -91 +91 @@
             </SpaceShip>
         <?lua end ?>
-        -->
   </Scene>
 </Level>

code/branches/formationupdate/src/orxonox/worldentities/pawns/Pawn.cc

@@ -325 +325 @@
                         }
                 }
+                orxout(user_warning) << "The HumanController has no slaves!" << endl;
                 return false;
     }
@@ -359 +360 @@
                  * Doesn't work yet
                  *
-                 * if(this->hasSlaves())
+                 */ if(this->hasSlaves())
                 {
                                 // start to control a slave
                                 this->getPlayer()->startControl(this->getSlave()->getControllableEntity());
-                }*/
-                this->getPlayer()->stopControl();
+                }
+                 else{
+                         this->getPlayer()->stopControl();
+                 }
             }
             if (GameMode::isMaster())