X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2Findex_wr.php;h=1ed5e59c6af9fc53ca411efa1891928d6c9c6ab6;hb=80b5207f21d47ef8fa0cf7841d9def00abd9070e;hp=a63b5da486196da59a81708e7c35d6a0d7c3fdc0;hpb=65aebe05fe1746e138532abbe287e411b4ec65e9;p=brisk.git

diff --git a/web/briskin5/index_wr.php b/web/briskin5/index_wr.php
index a63b5da..1ed5e59 100644
--- a/web/briskin5/index_wr.php
+++ b/web/briskin5/index_wr.php
@@ -2,7 +2,7 @@
 /*
  *  brisk - index_wr.php
  *
- *  Copyright (C) 2006-2008 Matteo Nastasi
+ *  Copyright (C) 2006-2009 Matteo Nastasi
  *                          mailto: nastasi@alternativeoutput.it 
  *                                  matteo.nastasi@milug.org
  *                          web: http://www.alternativeoutput.it
@@ -132,19 +132,21 @@ else if ($user->stat == 'table') {
     }
   }
   else if ($argz[0] == 'exitlock') {
-    $user->exitislock = ($user->exitislock == TRUE ? FALSE : TRUE);
-    for ($ct = 0, $i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {	
-      $user_cur[$i] = &$bri->user[$table->player[$i]];
-      if ($user_cur[$i]->exitislock == FALSE)
-	$ct++;
-    }
-    for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
-      $ret = sprintf('gst.st = %d;', $user_cur[$i]->step+1);
-      $ret .= sprintf('exitlock_show(%d, %s);', $ct, 
-		     ($user_cur[$i]->exitislock ? 'true' : 'false'));
-      $user_cur[$i]->comm[$user_cur[$i]->step % COMM_N] = $ret;
-      log_wr($user_cur[$i]->comm[$user_cur[$i]->step % COMM_N]);
-      $user_cur[$i]->step_inc();
+    if ($user->exitislock == TRUE) {
+      $user->exitislock = ($user->exitislock == TRUE ? FALSE : TRUE);
+      for ($ct = 0, $i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {	
+        $user_cur[$i] = &$bri->user[$table->player[$i]];
+        if ($user_cur[$i]->exitislock == FALSE)
+          $ct++;
+      }
+      for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+        $ret = sprintf('gst.st = %d;', $user_cur[$i]->step+1);
+        $ret .= sprintf('exitlock_show(%d, %s);', $ct, 
+                        ($user_cur[$i]->exitislock ? 'true' : 'false'));
+        $user_cur[$i]->comm[$user_cur[$i]->step % COMM_N] = $ret;
+        log_wr($user_cur[$i]->comm[$user_cur[$i]->step % COMM_N]);
+        $user_cur[$i]->step_inc();
+      }
     }
   }
   else if ($user->subst == 'asta') {
@@ -331,7 +333,7 @@ else if ($user->stat == 'table') {
       if ($table->asta_win > -1 && 
 	  $user->table_pos == $table->asta_win) {
 	$a_brisco = $argz[1];
-	if ($a_brisco >= 0 && $a_brisco < 40) {
+	if ($a_brisco >= 0 && $a_brisco < (BRISKIN5_PLAYERS_N == 5 ? 40 : 24)) {
 	  $table->briscola = $a_brisco;
 	  $table->friend   = $table->card[$a_brisco]->owner;
 	  log_wr("GSTART 2");
@@ -387,7 +389,7 @@ else if ($user->stat == 'table') {
       log_wr("CIC".$loggo);
 			  
       /* se era il suo turno e la carta era sua ed era in mano */
-      if ($a_play >=0 && $a_play < 40 &&
+      if ($a_play >=0 && $a_play < (BRISKIN5_PLAYERS_N == 5 ? 40 : 24) &&
 	  ($user->table_pos == (($table->gstart + $table->turn) % BRISKIN5_PLAYERS_N)) &&
 	  $table->card[$a_play]->stat == 'hand' &&
 	  $table->card[$a_play]->owner == $user->table_pos) {
@@ -452,14 +454,20 @@ else if ($user->stat == 'table') {
 	if ($table->turn == (BRISKIN5_PLAYERS_N * 8)) { /* game finished */
 	  log_wr(sprintf("GIOCO FINITO !!!"));
 
-          $plist = "$table->table_token|$user->table|$table->player_n";
-          $curtime = time();
-          log_legal($curtime, $user, "STAT:FINISH_GAME", $plist);
 
 	  /* ************************************************ */
 	  /*    PRIMA LA PARTE PER LO SHOW DI CHI HA VINTO    */
 	  /* ************************************************ */
-	  calculate_points(&$table);
+	  $pt_cur = calculate_points(&$table);
+
+          $plist = "$table->table_token|$user->table_orig|$table->player_n";
+          $curtime = time();
+          for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+            $user_cur = &$bri->user[$table->player[$i]];
+            $plist .= '|'.xcapelt($user_cur->name).'|'.$pt_cur[$i];
+          }
+          log_legal($curtime, $user, "STAT:BRISKIN5:FINISH_GAME", $plist);
+          log_points($curtime, $user, "STAT:BRISKIN5:FINISH_GAME", $plist);
 
 	  $table->game_next();
 	  $table->game_init(&$bri->user);