X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2Findex_wr.php;h=9c573610312ea870e373bb4b848840836a3b96a6;hb=e03584c986979bad9c4d469abe3e60c37911e002;hp=8719466baf993ef3454e0ed42bbecd203c387228;hpb=2ec5c3b08cbfdc57ca89d498f3d23090ed9bed51;p=brisk.git

diff --git a/web/briskin5/index_wr.php b/web/briskin5/index_wr.php
index 8719466..9c57361 100644
--- a/web/briskin5/index_wr.php
+++ b/web/briskin5/index_wr.php
@@ -188,6 +188,7 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
 
                     if ($user->table_pos != $index_cur ||
                         !$table->asta_pla[$index_cur]) {
+                        // FIXME_LANG
                         $ret_s = 'grave inconsistenza';
                         break;
                     }
@@ -197,19 +198,9 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
 
                     log_wr("CI SIAMO  a_card ".$a_card."  asta_card ".$table->asta_card);
 
-                    // Abbandono dell'asta
-                    if ($a_card <= -1) {
-                        log_wr("Abbandona l'asta.");
-                        $table->asta_pla[$index_cur] = FALSE;
-                        $user->asta_card  = -1;
-                        $table->asta_pla_n--;
-                    }
-                    else if ($a_card <= 9) {
-                        if (!$table->rules->engine(&$bin5, $curtime, BIN5_RULES_ASTA, $user, $ret_s, $a_card, $a_pnt)) {
-                            break;
-                        }
-                    }
-                    else {
+                    /* user action management */
+                    if (!$table->rules->engine(&$bin5, $curtime, BIN5_RULES_ASTA, $user,
+                                               $ret_s, $a_card, $a_pnt)) {
                         break;
                     }
 
@@ -218,7 +209,8 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
                     for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
                         $user_cur = &$bin5->user[$table->player[$i]];
                         $showst .= sprintf("%s%d", ($i == 0 ? "" : ", "),
-                                           ($user_cur->asta_card < 9 ? $user_cur->asta_card : $user_cur->asta_pnt));
+                                           ($user_cur->asta_card < 9 ? $user_cur->asta_card :
+                                            $user_cur->asta_pnt));
                     }
                     if (BIN5_PLAYERS_N == 3)
                         $showst .= ",-2,-2";
@@ -231,9 +223,14 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
                             $maxcard = $user_cur->asta_card;
                     }
 
-                    if (($table->asta_pla_n > ($maxcard > -1 ? 1 : 0)) &&
-                        !($table->asta_card == 9 && $table->asta_pnt == 120)) {
-                        log_wr("ALLOPPA QUI");
+                    /*
+                     *  IF not max points AND
+                     *  (asta_pla_n > 1 if someone bet OR
+                     *   asta_pla_n > 0 if someone NOT bet)
+                     *  THEN advance auction
+                     */
+                    if ($table->rules->engine(&$bin5, $curtime, BIN5_RULES_NEXTAUCT, $user, $maxcard)) {
+                        /* search the next player in auction and put it in gstart field */
                         for ($i = 1 ; $i < BIN5_PLAYERS_N ; $i++) {
                             $index_next = ($table->gstart + $i) % BIN5_PLAYERS_N;
                             if ($table->asta_pla[$index_next]) {
@@ -243,7 +240,7 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
                             }
                         }
 
-
+                        /* set client side view */
                         for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
                             $user_cur = &$bin5->user[$table->player[$i]];
                             $ret = sprintf('gst.st = %d; %s', $user_cur->step+1, $showst);
@@ -334,7 +331,11 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
                     if ($a_brisco >= 0 && $a_brisco < (BIN5_CARD_HAND * BIN5_PLAYERS_N)) {
                         $table->briscola = $a_brisco;
 
-                        $tourn_values = array(11, 10, 4,3,2, 1,1,1,1,1);
+                        if (BIN5_CARD_HAND == 8)
+                            $tourn_values = array(11, 10, 4,3,2, 1,1,1,1,1);
+                        else
+                            $tourn_values = array(33, 30, 12,9,6, 3,3,3,3,3);
+
                         $table->tourn_pts = 0;
                         $seed = $a_brisco - ($a_brisco % 10);
                         for ($i = $seed ; $i < ($seed + min(10, BIN5_CARD_HAND * BIN5_PLAYERS_N)) ; $i++) {