X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=5e92d00d1df944ee415ec26554e44e396fbe7ed7;hb=31f360d098b4863223ea11b4b0191d29ab4a4a25;hp=bc2162c324b3e4446a3f91bcd6336380bb262f39;hpb=a6d70a024c7ad3599d319bb1a7c94d6c366303b4;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index bc2162c..5e92d00 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -30,8 +30,12 @@ define(SHM_DIMS_MIN, (50000 + 10000 * TABLES_N + 15000 * MAX_PLAYERS));
 define(SHM_DIMS_MAX, SHM_DIMS_MIN + 1048576);
 define(SHM_DIMS_DLT, 65536);
  
-define(COMM_N, 12);
+define(COMM_N, 18);
 define(COMM_GEN_N, 50);
+
+define(CHAT_N, 3);
+define(CHAT_ILL_TIME, 6);
+
 define(SESS_LEN, 13);
 define(STREAM_TIMEOUT, 20);
 define(EXPIRE_TIME_RD, 180);
@@ -62,9 +66,9 @@ define(BRISK_SINGLE_SESS, "");
 $G_false = FALSE;
 
 $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "spawn-0.10.2";
+$G_brisk_version = "spawn-0.10.7";
 
-$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: dimensionamento dinamico dell\'area dati e ottimizzazione della stessa, versione beta.',
+$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: consiglio: se vuoi farti sentire parla poco - versione beta2.',
                         'Se vuoi iscriverti alla <a target="_blank" href="http://www.milug.org/cgi-bin/mailman/listinfo/ml-briscola">Mailing List</a>, cliccala!' );
 $table_wellarr = Array ( 'Benvenuto al tavolo. Se almeno tre giocatori non sbloccano l\'uscita cliccando il lucchetto, chi esce non pu&ograve; risedersi a un qualunque tavolo per '.floor(BAN_TIME/60).' minuti.');
 
@@ -492,6 +496,11 @@ class User {
   var $table_token;// token that identify a game on a table
   var $the_end;    // Flag to change the end of the session
 
+  var $chat_lst;      // Last chat line
+  var $chattime;      // Array of chat times
+  var $chat_cur;      // Current chat line number
+  var $chat_ban;      // Time for ban chat
+  var $chat_dlt;      // Delta t for ban
   function User() {
   }
 
@@ -517,6 +526,12 @@ class User {
     $thiz->handpt = -1;
     $thiz->exitislock = TRUE;
     
+    $thiz->chattime = array_fill(0, CHAT_N, 0);
+    $thiz->chat_cur = 0;
+    $thiz->chat_lst = "";
+    $thiz->chat_ban = 0;
+    $thiz->chat_dlt = 0;
+
     $thiz->table = $table;
     $thiz->table_pos = -1;
     $thiz->table_token = "";
@@ -552,6 +567,15 @@ class User {
     $thiz->asta_pnt   = $from->asta_pnt;
     $thiz->handpt     = $from->handpt;
     $thiz->exitislock = $from->exitislock;
+
+    $thiz->chattime = array();
+    for ($i = 0 ; $i < CHAT_N ; $i++)
+      $thiz->chattime[$i] = $from->chattime[$i];
+    $thiz->chat_cur = $from->chat_cur;
+    $thiz->chat_lst = $from->chat_lst;
+    $thiz->chat_ban = $from->chat_ban;
+    $thiz->chat_dlt = $from->chat_dlt;
+
     $thiz->table      = $from->table;
     $thiz->table_pos  = $from->table_pos;
     $thiz->table_token = $from->table_token;
@@ -593,6 +617,12 @@ class User {
     $thiz->exitislock = $from->exitislock;
     $thiz->the_end    = $from->the_end;
 
+    $thiz->chattime   = array_fill(0, CHAT_N, 0);
+    $thiz->chat_cur   = 0;
+    $thiz->chat_lst   = "";
+    $thiz->chat_ban   = 0;
+    $thiz->chat_dlt   = 0;
+
     $thiz->table      = $table;
     $thiz->table_pos  = $table_pos;
     $thiz->table_token = $from->table_token;
@@ -643,6 +673,16 @@ class User {
     
     return (FALSE);
   }
+
+  function reset() {
+    $tmp_sess = $this->sess;
+    $this->sess = "";
+    step_unproxy($tmp_sess);
+    $this->name = "";
+    while (array_pop($this->comm) != NULL);
+    $this->step = 0;
+    $this->the_end = FALSE;
+  }
 } // end class User
 
 
@@ -818,12 +858,16 @@ class Room {
 	  if ($user_cur->stat == 'table' || $user_cur->stat == 'room') {
 	    log_auth($user_cur->sess, "Autologout session.");
 	    
+	    $user_cur->reset();
+	    /* factorized with ->reset()
 	    $tmp_sess = $user_cur->sess;
 	    $user_cur->sess = "";
 	    step_unproxy($tmp_sess);
 	    $user_cur->name = "";
+	    while (array_pop($user_cur->comm) != NULL);
 	    $user_cur->step = 0;
 	    $user_cur->the_end = FALSE;
+	    */
 	    
 	    log_rd2("AUTO LOGOUT.");
 	    if ($user_cur->subst == 'sitdown' || $user_cur->stat == 'table')
@@ -1005,8 +1049,9 @@ class Room {
 	if ($tab_idx < $user_tab_n) {
 	  log_main("PRE show_room username: ".$user_cur->name."  STEP: ".$user_cur->step);
 
-	  if ($trans_delta == 0)
-	    while (array_pop($user_cur->comm) != NULL);
+//        ARRAY_POP DISABLED
+// 	  if ($trans_delta == 0)
+// 	    while (array_pop($user_cur->comm) != NULL);
 
 	  $user_cur->trans_step = $user_cur->step + 1 + $trans_delta;
 	  $user_cur->comm[$user_cur->step % COMM_N] = "";
@@ -1103,6 +1148,8 @@ class Room {
 
   function chatt_send(&$user, $mesg)
   {
+    $only_you = FALSE;
+    
     if ($user->stat == 'table') {
       $table = &$this->table[$user->table];
     }
@@ -1183,6 +1230,24 @@ class Room {
       }
     }
     else {
+      if ($timecur < ($user->chat_ban + $user->chat_dlt)) {
+        $only_you = TRUE;
+        $user->chat_dlt = $user->chat_dlt * 2; 
+        if ($user->chat_dlt > 120)
+          $user->chat_dlt = 120; 
+      }
+      else if ($user->chat_lst == $user_mesg)
+        $only_you = TRUE;
+      else if ($timecur - $user->chattime[($user->chat_cur + 1) % CHAT_N] < CHAT_ILL_TIME) {
+        $user->chat_ban = $timecur;
+        $user->chat_dlt = 5;
+        $only_you = TRUE;
+      }
+      else {
+        $user->chat_ban = 0;
+        $user->chat_dlt = 0;
+      }
+
       for ($i = 0 ; $i < ($user->stat == 'room' ? MAX_PLAYERS : PLAYERS_N) ; $i++) {
 	if ($user->stat == 'room') {
 	  $user_cur = &$this->user[$i];
@@ -1192,6 +1257,13 @@ class Room {
 	else {
 	  $user_cur = &$this->user[$table->player[$i]];
 	}
+
+        if ($only_you) {
+          if ($user_cur != $user)
+            continue;
+          else
+            $user_mesg = "== chat ban ==";
+        }
 	
 	$user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
 	$user_cur->comm[$user_cur->step % COMM_N] .= sprintf('chatt_sub("%s","%s");',
@@ -1200,6 +1272,10 @@ class Room {
       }
       log_legal($timecur, $user->sess, $user->name, 
 		($user->stat == 'room' ? 'room' : 'table '.$user->table),$user_mesg);
+      
+      $user->chat_lst = "$user_mesg";
+      $user->chattime[$user->chat_cur % CHAT_N] = $timecur;
+      $user->chat_cur++;
     }
   }