[Orxonox-commit 4915] r9584 - in code/branches/formationupdate: data/levels src/orxonox/worldentities/pawns

[maxima at orxonox.net]

Author: maxima
Date: 2013-03-26 16:02:36 +0100 (Tue, 26 Mar 2013)
New Revision: 9584

Modified:
   code/branches/formationupdate/data/levels/maxim.oxw
   code/branches/formationupdate/src/orxonox/worldentities/pawns/Pawn.cc
Log:
Second Formation in Maxim-Level


Modified: code/branches/formationupdate/data/levels/maxim.oxw
===================================================================
--- code/branches/formationupdate/data/levels/maxim.oxw	2013-03-26 14:30:12 UTC (rev 9583)
+++ code/branches/formationupdate/data/levels/maxim.oxw	2013-03-26 15:02:36 UTC (rev 9584)
@@ -72,12 +72,26 @@
 	            <Template link=spaceshipswallow /> 
 	        </templates>
 	        <controller>
+	            <AIController team=0/>
+	        </controller>
+	    </SpaceShip>
+	<?lua end ?>
+	
+	
+	<!-- ADDING ENEMY FORMATION: 5 Swallows -->
+	<!--
+	<?lua for i=0,4,1 do
+	?>
+	    <SpaceShip position="<?lua print(5000+i*200) ?>,-200,1000" lookat="-1300,-600,900" visible="true">
+	        <templates>
+	            <Template link=spaceshipswallow /> 
+	        </templates>
+	        <controller>
 	            <AIController team=1/>
 	        </controller>
 	    </SpaceShip>
 	<?lua end ?>
-
-
+	-->
   </Scene>
 </Level>
 

Modified: code/branches/formationupdate/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/formationupdate/src/orxonox/worldentities/pawns/Pawn.cc	2013-03-26 14:30:12 UTC (rev 9583)
+++ code/branches/formationupdate/src/orxonox/worldentities/pawns/Pawn.cc	2013-03-26 15:02:36 UTC (rev 9584)
@@ -310,7 +310,7 @@
     void Pawn::death()
     {
         /* TEST TEST This is used to find out if the current pawn is also 
-         * the master of the formulation.
+         * the master of the formation.
          *
          * NOTE: This does not yet check if the current pawn is actually 
          *       the humanplayer or not!