From 661662406972f5df7fa7e0029094665365b3928a Mon Sep 17 00:00:00 2001
From: Gnieark <rpasserieu@ch-boispetit.fr>
Date: Thu, 30 Jun 2016 14:53:38 +0200
Subject: [PATCH] fix js

---
 src/arenas/tron/act.php       | 42 +++++++++++++++++++----------------
 src/arenas/tron/functions.php |  8 +++++--
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/arenas/tron/act.php b/src/arenas/tron/act.php
index a195146..2daeda9 100644
--- a/src/arenas/tron/act.php
+++ b/src/arenas/tron/act.php
@@ -17,26 +17,30 @@ switch ($_POST['act']){
   case "initGame":
   
     //check if bots exists
-    $bots=get_Bots_Array('tron');
-    $botsArray = json_decode($_POST['bots']);
-
-    $bot1Exists = false;
-    $bot2Exists = false;
-    foreach($bots as $bot){
-	if($bot['id'] == $_POST['bot1']){
-	    $_SESSION['bots'][]=new TronPlayer($bot['id'],500,10,'y+');
-	    $bot1Exists =true;
-	}
-	if($bot['id'] == $_POST['bot2']){
-	    $_SESSION['bots'][]=new TronPlayer($bot['id'],500,989,'y-');
-	    $bot2Exists =true;
-	}
-	if ($bot1Exists && $bot2Exists){
-	    break;
-	} 
+    $botsArrayTemp = json_decode($_POST['bots']);
+    
+    $_SESSION['bots'] = array();
+    $positions = array();
+    $botCount = 0;
+    foreach($botsArrayTemp as $botId){
+      do{
+	  $x = rand(1,999);
+	  $y = rand(1,999);
+      }while(in_array($x.",".$y,$positions));
+      
+      $positions[] = $x.",".$y;
+      $_SESSION['bots'][$botCount] =  new TronPlayer($bot['id'],500,10,'y+');
+      
+      if  ($_SESSION['bots'][$botCount]->getStatus() === false){
+       unset($_SESSION['bots'][$botCount]);
+      }else{
+	$botCount++;
+      }
+      
     }
-    if ((!$bot1Exists) OR (!$bot2Exists)){
-	error (500,"missing parameter 2");
+
+    if ($botCount < 2){
+	error (500,"missing bots");
     }
     
   
diff --git a/src/arenas/tron/functions.php b/src/arenas/tron/functions.php
index 1267fdf..ac8190a 100644
--- a/src/arenas/tron/functions.php
+++ b/src/arenas/tron/functions.php
@@ -6,7 +6,11 @@ class TronPlayer{
   private $tail = array();
   private $direction;
   private $state;
-
+  
+  public function getStatus(){
+    return $this->state;
+  }
+  
   private function set_direction($newDir){
     //can't be the opposite of the previous direction
     if(
@@ -20,7 +24,7 @@ class TronPlayer{
     $this->direction = $newdir;
     return true;
   }
-  
+
   public function grow($dir=""){
     if($dir == ""){
       $dir = $this->direction;