[Orxonox-commit 6698] r11327 - in code/branches/SpaceRace_HS16: data/levels src/modules/gametypes

[bberabi at orxonox.net]

Author: bberabi
Date: 2016-12-12 14:11:48 +0100 (Mon, 12 Dec 2016)
New Revision: 11327

Modified:
   code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
   code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc
Log:
die startpositonen und sterben von bots

Modified: code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
===================================================================
--- code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw	2016-12-09 12:37:46 UTC (rev 11326)
+++ code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw	2016-12-12 13:11:48 UTC (rev 11327)
@@ -1,6 +1,6 @@
 
   <!-- Authors:
-Louis ...? :D
+Louis Meile
 Berkay Berabi
 @2016
 -->
@@ -45,7 +45,7 @@
 
   <!-- SOUNDS & MUSIC -->
   
-  
+   
 <WorldSound name="Countdown" position="0,0,0" source="sounds/Countdown.ogg" >
       <events>
         <play>
@@ -81,7 +81,7 @@
 
 
     <!-- ------------------SpawnPoint----------------- -->
-    <SpawnPoint position="0,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" />
+    <SpawnPoint position="-50,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" />
 
   <!-- Launch station -->
   <StaticEntity mass="50" position="-400,-20,0" direction="0,-90,0" collisionType="static">

Modified: code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc
===================================================================
--- code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc	2016-12-09 12:37:46 UTC (rev 11326)
+++ code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc	2016-12-12 13:11:48 UTC (rev 11327)
@@ -81,7 +81,7 @@
     {
 
 
-        std::vector<int> spawnpositions;
+       /* std::vector<int> spawnpositions;
         
         spawnpositions.push_back(200);
         spawnpositions.push_back(0);
@@ -102,8 +102,38 @@
         spawnpositions.push_back(0);
         spawnpositions.push_back(100);
         spawnpositions.push_back(0);
+*/  
+        int startpos[15];
+        
+        startpos[0] =100;
+        startpos[1] =-40;
+        startpos[2] =0;
+        
+        startpos[3] =100;
+        startpos[4] =-40;
+        startpos[5] =100;
+        
+        startpos[6] =100;
+        startpos[7] =-40;
+        startpos[8] =-100;
+        
+        startpos[9] =0;
+        startpos[10] =-40;
+        startpos[11] =-80;
+        
+        startpos[12] =0;
+        startpos[13] =-40;
+        startpos[14] =80;
+        
+        /*startpos[15] =
+        startpos[0] =
+        startpos[0] =
+        startpos[0] =
+        startpos[0] =
+        startpos[0] =*/
 
 
+
         Gametype::start();
    if (true)
         {
@@ -121,7 +151,7 @@
             b=1;
             c=2;
               for (SpaceRaceBot* bot : ObjectList<SpaceRaceBot>()){
-                bot->getControllableEntity()->setPosition(spawnpositions.at(a),spawnpositions.at(b),spawnpositions.at(c));
+                bot->getControllableEntity()->setPosition(startpos[a],startpos[b],startpos[c]);
                a= a+3;
                b = b+3; 
                c+= 3;
@@ -130,8 +160,8 @@
 
         }
 
+                                                
 
-                
         std::string message("BE FAST BE FIRST");
         this->getGametypeInfo()->sendAnnounceMessage(message);
         ChatManager::message(message);
@@ -284,6 +314,6 @@
 
     bool SpaceRace::allowPawnDeath(Pawn* victim, Pawn* originator)
     {
-        return true;
+        return false;
     }
 }