X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2Findex_wr.php;h=a36c03fcb6fde51803b6364f21ed9358f7aaf2a4;hb=7332bf2e21e419c2f5af5f7e955367b59c9da135;hp=534fd28029f5becbb9f9a3935052a81daefa35d7;hpb=8b9c2b3ec59baef7c9f64f9663347bc5b9cf69fe;p=brisk.git

diff --git a/web/briskin5/index_wr.php b/web/briskin5/index_wr.php
index 534fd28..a36c03f 100644
--- a/web/briskin5/index_wr.php
+++ b/web/briskin5/index_wr.php
@@ -26,15 +26,8 @@
 $G_base = "../";
 
 require_once("../Obj/brisk.phh");
-// require_once("../Obj/proxyscan.phh");
 require_once("Obj/briskin5.phh");
 
-// Use of proxies isn't allowed.
-// if (is_proxy()) {
-//   sleep(5);
-//   exit;
-//}
-
 /*
  *  MAIN
  */
@@ -117,7 +110,7 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
             $user->step_inc();
         }
         else if ($argz[0] == 'chatt') {
-            $bin5->chatt_send(&$user,$mesg);
+            $bin5->chatt_send(&$user, $mesg);
         }
         else if ($argz[0] == 'preferences_update') {
             log_wr("PER DI PREFERENCES_UPDATE");
@@ -156,7 +149,7 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
             //      $user->bantime = $user->laccwr + BAN_TIME;
 
             if ($logout_cont == TRUE) {
-                $bin5->table_wakeup(&$user);
+                $bin5->table_wakeup($user);
             }
         }
         else if ($argz[0] == 'exitlock') {
@@ -205,7 +198,7 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
 
                 /* $table->game_init(&$bin5->user); */
 
-                if ($table->rules_engine(&$bin5, $curtime, BIN5_RULES_ABANDON, $user)) {
+                if ($table->rules->engine(&$bin5, $curtime, BIN5_RULES_ABANDON, $user)) {
                     for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
                         $user_cur = &$bin5->user[$table->player[$i]];
 
@@ -309,7 +302,7 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
                         else if ($table->asta_pla_n == 0) {
                             log_wr("PASSANO TUTTI!");
 
-                            if ($table->rules_engine(&$bin5, $curtime, BIN5_RULES_ALLPASS, $user)) {
+                            if ($table->rules->engine(&$bin5, $curtime, BIN5_RULES_ALLPASS, $user)) {
                                 for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
                                     $user_cur = &$bin5->user[$table->player[$i]];
 
@@ -371,8 +364,18 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
                 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 < (BIN5_CARD_HAND * BIN5_PLAYERS_N)) {
                         $table->briscola = $a_brisco;
+
+                        $tourn_values = array(11, 10, 4,3,2, 1,1,1,1,1);
+                        $table->tourn_pts = 0;
+                        $seed = $a_brisco - ($a_brisco % 10);
+                        for ($i = $seed ; $i < ($seed + min(10, BIN5_CARD_HAND * BIN5_PLAYERS_N)) ; $i++) {
+                            if ($table->card[$i]->owner == $table->asta_win) {
+                                $table->tourn_pts += $tourn_values[$i - $seed];
+                            }
+                        }
+
                         $table->friend   = $table->card[$a_brisco]->owner;
                         log_wr("GSTART 2");
                         $table->gstart = ($table->mazzo+1) % BIN5_PLAYERS_N;
@@ -497,7 +500,7 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
                     if ($table->turn == (BIN5_PLAYERS_N * BIN5_CARD_HAND)) { /* game finished */
                         log_wr(sprintf("GIOCO FINITO !!!"));
 
-                        if ($table->rules_engine(&$bin5, $curtime, BIN5_RULES_FINISH, $user)) {
+                        if ($table->rules->engine(&$bin5, $curtime, BIN5_RULES_FINISH, $user)) {
                             for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
                                 $user_cur = &$bin5->user[$table->player[$i]];
                                 $retar[$i] .= show_table(&$bin5,&$user_cur,$user_cur->step+1,TRUE, TRUE);