X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2FObj%2Frules_old_rules.phh;h=3aba2a088d3fe136a529597a8499fbcae6af1878;hb=9ba799fd90019d1fcf52e416e4b3fb5eb67f710f;hp=957b8be73421fe785a5cb00b0debe2e42b03b0c9;hpb=827cf9b1db2abe2e726ac97063f90445244cf99f;p=brisk.git

diff --git a/web/briskin5/Obj/rules_old_rules.phh b/web/briskin5/Obj/rules_old_rules.phh
index 957b8be..3aba2a0 100644
--- a/web/briskin5/Obj/rules_old_rules.phh
+++ b/web/briskin5/Obj/rules_old_rules.phh
@@ -125,6 +125,18 @@ class Rules_old_rules extends Rules {
         return FALSE;
     }
 
+    function rules_checkchoose(&$bri, $curtime, $action, $user, &$ret_s, $a_brisco)
+    {
+        if ( !($a_brisco >= 0 && $a_brisco < 40)) // (BIN5_CARD_HAND * BIN5_PLAYERS_N)) )
+            return FALSE;
+
+        if ( !($this->table->asta_win > -1 &&
+               $user->table_pos == $this->table->asta_win) )
+            return FALSE;
+
+        return TRUE;
+    }
+
     function rules_nextauct(&$bri, $curtime, $action, $user, $maxcard)
     {
         if (($this->table->asta_pla_n > ($maxcard > -1 ? 1 : 0)) &&
@@ -145,7 +157,7 @@ class Rules_old_rules extends Rules {
         $pnts_sav = array();
 
         if ($action == BIN5_RULES_ASTA) {
-            return ($this->rules_asta($bri, $curtime, $action, $user, &$opt1, $opt2, $opt3));
+            return ($this->rules_asta($bri, $curtime, $action, $user, $opt1, $opt2, $opt3));
         }
         else if ($action == BIN5_RULES_NEXTAUCT) {
             return ($this->rules_nextauct($bri, $curtime, $action, $user, $opt1));
@@ -161,7 +173,7 @@ class Rules_old_rules extends Rules {
 
             $game_delta = 1;
             // $table->game_next(1);
-            $table->game_init(&$bri->user);
+            $table->game_init($bri->user);
         }
         else if ($action == BIN5_RULES_ABANDON) { // return TRUE if all correct
             if (!($user->handpt <= 2)) {
@@ -180,7 +192,10 @@ class Rules_old_rules extends Rules {
             // Non si cambia mazzo se si abbandona la partita
             $game_delta = 0;
             // $table->game_next(0);
-            $table->game_init(&$bri->user);
+            $table->game_init($bri->user);
+        }
+        else if ($action == BIN5_RULES_CHECKCHOOSE) {
+            return ($this->rules_checkchoose($bri, $curtime, $action, $user, $opt1, $opt2));
         }
         else if ($action == BIN5_RULES_FINISH) { // return TRUE if all correct
             $table->old_act = $action;
@@ -299,7 +314,7 @@ class Rules_old_rules extends Rules {
             log_points($user->ip, $curtime, $user, "STAT:BRISKIN5:FINISH_GAME", $plist);
         }
 
-        $table->game_init(&$bri->user);
+        $table->game_init($bri->user);
 
         return (TRUE);
     }
@@ -347,8 +362,7 @@ class Rules_old_rules extends Rules {
                 $noty .= sprintf($mlang_bin5_rules['info_part'][$G_lang],
                                  $tg_br, $tg_hr, $tg_bo, $tg_bc,
                                  $win_name,
-                                 $fri_name,
-                                 $old_tourn_pts);
+                                 $fri_name);
                 if ($old_pnt == 120) {
                     $noty .= sprintf($mlang_bin5_rules['info_capp'][$G_lang],
                                      $tg_br, $tg_hr, $tg_bo, $tg_bc );
@@ -375,8 +389,7 @@ class Rules_old_rules extends Rules {
             else {
                 $noty .= sprintf($mlang_bin5_rules['info_alon'][$G_lang],
                                  $tg_br, $tg_hr, $tg_bo, $tg_bc,
-                                 $win_name,
-                                 $old_tourn_pts);
+                                 $win_name);
                 if ($old_pnt == 120) {
                     $noty .= sprintf($mlang_bin5_rules['info_acap'][$G_lang],
                                      $tg_br, $tg_hr, $tg_bo, $tg_bc);