BRISKIN5_ to BIN5_ constants prefix and Briskin5 to Bin5 class rename

diff --git a/INSTALL.sh b/INSTALL.sh
index b26411b..a82e530 100755 (executable)
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -292,7 +292,7 @@ sed -i "s/^var G_send_time *= *[0-9]\+/var G_send_time = $send_time/g" $(find ${
 # .ph[pho] substitutions
 sed -i "s/define *( *PLAYERS_N, *[0-9]\+ *)/define(PLAYERS_N, $players_n)/g" $(find ${web_path}__ -type f -name '*.ph*' -exec grep -l 'define *( *PLAYERS_N, *[0-9]\+ *)' {} \;)
 
-sed -i "s/define *( *BRISKIN5_PLAYERS_N, *[0-9]\+ *)/define(BRISKIN5_PLAYERS_N, $players_n)/g" $(find ${web_path}__ -type f -name '*.ph*' -exec grep -l 'define *( *BRISKIN5_PLAYERS_N, *[0-9]\+ *)' {} \;)
+sed -i "s/define *( *BIN5_PLAYERS_N, *[0-9]\+ *)/define(BIN5_PLAYERS_N, $players_n)/g" $(find ${web_path}__ -type f -name '*.ph*' -exec grep -l 'define *( *BIN5_PLAYERS_N, *[0-9]\+ *)' {} \;)
 
 sed -i "s@define *( *FTOK_PATH,[^)]*)@define(FTOK_PATH, \"$ftok_path\")@g" $(find ${web_path}__ -type f -name '*.ph*' -exec grep -l 'define *( *FTOK_PATH,[^)]*)' {} \;)
 

diff --git a/TODO.txt b/TODO.txt
index a06d080..bdf8ccd 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -10,6 +10,11 @@
  DONE - move the garbage timeout on file
  DONE - in index_rd load all data only when required
  - briskin5 alignment
+   . extern del garb_timeout
+   . user_load parameters verify
+   . Bin5::load_data and Bin5::save_data refactoring with
+     data split
+   . move many function into "Bin5 class"
 
  DB: - initial usage
      DONE - configurabilità file o db

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 7a608ca..32936fb 100644 (file)
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -1073,11 +1073,11 @@ class Room {
        if ($table_cur->player_n == PLAYERS_N) {
          log_main("PLAYERS == N TABLE ".$table_idx);
          
-         if (($sem = Briskin5::lock_data($table_idx)) != FALSE) { 
+         if (($sem = Bin5::lock_data($table_idx)) != FALSE) { 
            log_main("bin5 lock data success");
            
            $no_recovery = FALSE;
-           if (($bri = &Briskin5::load_data($table_idx)) != FALSE) {
+           if (($bri = Bin5::load_data($table_idx)) != FALSE) {
              if ($table_cur->table_token != $bri->table_token) {
                log_main("ERROR: not matching table_token. Room: ".$table_cur->table_token."  Table: ".$bri->table_token);
                log_main("ERROR: not matching table_start. Room: ".$table_cur->table_start."  Table: ".$bri->table_start);
@@ -1124,7 +1124,7 @@ class Room {
                $this->room_join_wakeup(&$user_cur, FALSE, 0); 
                $table_cur->table_token = "";
                 $table_cur->wakeup_time = $curtime + WAKEUP_TIME;
-               Briskin5::destroy_data($table_idx);
+               Bin5::destroy_data($table_idx);
              }
              else {
                log_main("gm:: save_data");
@@ -1133,9 +1133,9 @@ class Room {
                  $this->user[$table_cur->player[$i]]->lacc = $bri->user[$i]->lacc;
                }
              
-               Briskin5::save_data(&$bri);
+               Bin5::save_data(&$bri);
              }
-           } // else if (($bri = &Briskin5::load_data($table_idx)) != FALSE) {
+           } // else if (($bri = &Bin5::load_data($table_idx)) != FALSE) {
            else if ($no_recovery == FALSE) {
              log_crit("ERROR: table ".$table_idx." unrecoverable join");
 
@@ -1163,7 +1163,7 @@ class Room {
              $table_cur->table_token = "";
            }
 
-           Briskin5::unlock_data($sem);
+           Bin5::unlock_data($sem);
          } // bri::lock_data
        } //  if ($table_cur->player_n == PLAYERS_N) {
       } //  for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) {
@@ -1936,9 +1936,9 @@ class Room {
                 $bri_user->comm[$bri_user->step % COMM_N] .= $to_tabl;
                 $bri_user->step_inc();
               }
-              Briskin5::save_data(&$bri);
+              Bin5::save_data(&$bri);
             }
-            Briskin5::unlock_data($sem);
+            Bin5::unlock_data($sem);
           } // bri::lock_data
         } //  if ($table_cur->player_n == PLAYERS_N) {
       } //  for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) {
@@ -2092,15 +2092,15 @@ class Room {
       if ($ghost_user->stat == "table" && $this->table[$table_idx]->player_n == PLAYERS_N) {
         // FIXME BRISK4: include for each kind of table
         require_once("${G_base}briskin5/Obj/briskin5.phh");
-        if (($brisem = Briskin5::lock_data($table_idx)) != FALSE) { 
-          if (($bri = &Briskin5::load_data($table_idx)) != FALSE) {
+        if (($brisem = Bin5::lock_data($table_idx)) != FALSE) { 
+          if (($bri = &Bin5::load_data($table_idx)) != FALSE) {
             if ($bri->the_end != TRUE) {
               $bri->user[$ghost_user->table_pos]->step_inc();
               $bri->user[$ghost_user->table_pos]->sess = $sess;
-              Briskin5::save_data(&$bri);
+              Bin5::save_data(&$bri);
             }
           }
-          Briskin5::unlock_data($brisem);
+          Bin5::unlock_data($brisem);
         }
       }
 

diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index 06f737e..90cc082 100644 (file)
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -21,12 +21,13 @@
  * Suite 330, Boston, MA 02111-1307, USA.
  *
  */
-define(BRISKIN5_PLAYERS_N, 3);
-define(BRISKIN5_MAX_PLAYERS, BRISKIN5_PLAYERS_N);
-// define(BRISKIN5_SHM_MIN, (50000 * BRISKIN5_MAX_PLAYERS));
-define(BRISKIN5_SHM_MIN, 32768);
-define(BRISKIN5_SHM_MAX, (BRISKIN5_SHM_MIN + 1048576));
-define(BRISKIN5_SHM_DLT, 32768);
+define(BIN5_PLAYERS_N, 3);
+define(BIN5_MAX_PLAYERS, BIN5_PLAYERS_N);
+// define(BIN5_SHM_MIN, (50000 * BIN5_MAX_PLAYERS));
+define(BIN5_SHM_MIN, 32768);
+define(BIN5_SHM_MAX, (BIN5_SHM_MIN + 1048576));
+define(BIN5_SHM_DLT, 32768);
+define(BIN5_PROXY_PATH, PROXY_PATH."/bin5");
 
 $mlang_bin5_bin5 = array( 
                          'info_part' => array( 'it' => '<hr>Nell\'ultima mano ha chiamato <b>%s</b>, il socio era <b>%s</b>,<br>',
@@ -137,7 +138,7 @@ class Card {
   }
 } // end class Card
 
-class Table_briskin5 extends Table {
+class Bin5_table extends Table {
   var $card;       // il mazzo di carte
   var $mazzo;      // chi e' di mazzo
   var $gstart;
@@ -164,7 +165,7 @@ class Table_briskin5 extends Table {
   var $old_win;
   var $old_friend;
 
-  function Table_briskin5() 
+  function Bin5_table() 
   {
   }
 
@@ -172,7 +173,7 @@ class Table_briskin5 extends Table {
   /* CREATE() NOT USED
   function create($idx) 
   {
-    if (($thiz =& new Table_briskin5()) == FALSE)
+    if (($thiz =& new Bin5_table()) == FALSE)
       return (FALSE);
 
     $thiz->create($idx);
@@ -206,7 +207,7 @@ class Table_briskin5 extends Table {
   /* CLONE() NOT USED
   function myclone(&$from)
   {
-    if (($thiz =& new Table_briskin5()) == FALSE)
+    if (($thiz =& new Bin5_table()) == FALSE)
       return (FALSE);
     
     parent::copy($from);
@@ -248,7 +249,7 @@ class Table_briskin5 extends Table {
 
   function spawn(&$from)
   {
-    if (($thiz =& new Table_briskin5()) == FALSE)
+    if (($thiz =& new Bin5_table()) == FALSE)
       return (FALSE);
     
     $thiz->parentcopy($from);
@@ -278,7 +279,7 @@ class Table_briskin5 extends Table {
   //   {
   //     $ret = array();
   // 
-  //     for ($i = 0 ; $i < (BRISKIN5_PLAYERS_N == 5 ? 40 : 24) ; $i++) {
+  //     for ($i = 0 ; $i < (BIN5_PLAYERS_N == 5 ? 40 : 24) ; $i++) {
   //       // for ($i = 0 ; $i < 40 ; $i++) {
   //       $ret[$i] =& new Card($i, 'bunch', 'no_owner');
   //     }
@@ -291,7 +292,7 @@ class Table_briskin5 extends Table {
   {
       $ret = array();
       
-      for ($i = 0 ; $i < (BRISKIN5_PLAYERS_N == 5 ? 40 : 24) ; $i++) {
+      for ($i = 0 ; $i < (BIN5_PLAYERS_N == 5 ? 40 : 24) ; $i++) {
           $this->card[$i] = new Card($i, 'bunch', 'no_owner');
       }
   }
@@ -303,10 +304,10 @@ class Table_briskin5 extends Table {
     
     mt_srand(make_seed());
     
-    for ($i = (BRISKIN5_PLAYERS_N == 5 ? 40 : 24) - 1 ; $i >= 0 ; $i--) 
+    for ($i = (BIN5_PLAYERS_N == 5 ? 40 : 24) - 1 ; $i >= 0 ; $i--) 
       $rest[$i] = $i;
 
-    for ($i = (BRISKIN5_PLAYERS_N == 5 ? 40 : 24) - 1 ; $i >= 0 ; $i--) {
+    for ($i = (BIN5_PLAYERS_N == 5 ? 40 : 24) - 1 ; $i >= 0 ; $i--) {
       $rn = rand(0, $i);
       
       if ($rn == 0)
@@ -314,7 +315,7 @@ class Table_briskin5 extends Table {
       
       $id = $rest[$rn];
 
-      $owner = $i % BRISKIN5_PLAYERS_N;
+      $owner = $i % BIN5_PLAYERS_N;
       $this->card[$id]->assign('hand', $owner);
 
       $rest[$rn] = $rest[$i];
@@ -332,7 +333,7 @@ class Table_briskin5 extends Table {
     $this->old_win  = -1;
     $this->old_reason = "";
     */
-    for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+    for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
       $this->total[$i] = 0;
       $user_cur = $userarr[$this->player[$i]];
       $user_cur->exitislock = TRUE;
@@ -345,11 +346,11 @@ class Table_briskin5 extends Table {
   {
     log_rd2("GSTART 4");
 
-    $this->gstart = ($this->mazzo+1) % BRISKIN5_PLAYERS_N;
+    $this->gstart = ($this->mazzo+1) % BIN5_PLAYERS_N;
     $this->bunch_make();
     
     
-    $this->asta_pla_n = BRISKIN5_PLAYERS_N;
+    $this->asta_pla_n = BIN5_PLAYERS_N;
     $this->asta_card = -1;
     $this->asta_pnt  = 60;
     $this->asta_win  = -1;
@@ -357,7 +358,7 @@ class Table_briskin5 extends Table {
     $this->friend    = -1;
     $this->turn      =  0;
     
-    for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+    for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
       $this->asta_pla[$i] = TRUE;
       $user_cur = $userarr[$this->player[$i]];
       $user_cur->subst = 'asta';
@@ -371,7 +372,7 @@ class Table_briskin5 extends Table {
 
   function game_next()
   {
-    $this->mazzo  = ($this->mazzo + 1) % BRISKIN5_PLAYERS_N;
+    $this->mazzo  = ($this->mazzo + 1) % BIN5_PLAYERS_N;
   }
 
 
@@ -381,7 +382,7 @@ class Table_briskin5 extends Table {
     
     $tot = 0;
     
-    for ($i = 0 ; $i < (BRISKIN5_PLAYERS_N == 5 ? 40 : 24) ; $i++) {
+    for ($i = 0 ; $i < (BIN5_PLAYERS_N == 5 ? 40 : 24) ; $i++) {
       // for ($i = 0 ; $i < 40 ; $i++) {
       if ($this->card[$i]->owner != $idx)
        continue;
@@ -516,13 +517,13 @@ class Briskin5 {
   var $the_end;
   var $tok;
 
-  function Briskin5 (&$room, $table_idx, $table_token) {
+  function Bin5 ($room, $table_idx, $table_token) {
     $this->user = array();
     $this->table = array();
 
     $this->the_end = FALSE;
-    $this->shm_sz = BRISKIN5_SHM_MIN;
-    if (($this->tok = @ftok(FTOK_PATH."/table".$table_idx, "B")) == -1) {
+    $this->shm_sz = BIN5_SHM_MIN;
+    if (($this->tok = @ftok(FTOK_PATH."/bin5/table".$table_idx."/table", "B")) == -1) {
       echo "FTOK FAILED";
       exit;
     }
@@ -530,21 +531,21 @@ class Briskin5 {
     $user  = $room->user;
     $table = $room->table[$table_idx];
 
-    log_wr("Briskin5 constructor");
+    log_wr("Bin5 constructor");
 
     for ($i = 0 ; $i < $table->player_n ; $i++) {
       $user[$table->player[$i]]->table_token = $table_token;
-      $this->user[$i] =& User_briskin5::spawn($user[$table->player[$i]], $table_idx, $i);
+      $this->user[$i] = Bin5_user::spawn($user[$table->player[$i]], $table_idx, $i);
     }
-    $this->table[0] =& Table_briskin5::spawn(&$table);
+    $this->table[0] = Bin5_table::spawn(&$table);
 
-    log_main("TABLE_OLD_WIN - Briskin5:".$this->table[0]->old_win);
+    log_main("TABLE_OLD_WIN - Bin5:".$this->table[0]->old_win);
 
     $this->table_idx = $table_idx;
     $this->table_token = $table_token;
-    $this->garbage_timeout = 0;
+    Bin5::garbage_time_expire_set(0);
     
-    log_wr("Briskin5 constructor end");
+    log_wr("Bin5 constructor end");
   }
 
 
@@ -553,7 +554,7 @@ class Briskin5 {
     GLOBAL $PHP_SELF;
 
     if (validate_sess($sess)) {
-      for ($i = 0 ; $i < BRISKIN5_MAX_PLAYERS ; $i++) {
+      for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) {
        if (strcmp($sess, $this->user[$i]->sess) == 0) {
          // find it
          $idx = $i;
@@ -562,7 +563,7 @@ class Briskin5 {
        }
       }
       log_main(sprintf("get_user: Wrong sess from page [%s]",$PHP_SELF));
-      // for ($i = 0 ; $i < BRISKIN5_MAX_PLAYERS ; $i++) 
+      // for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) 
       // log_main(sprintf("get_user: Wrong sess compared with [%s]",$this->user[$i]->sess));
     }
     else {
@@ -580,9 +581,9 @@ class Briskin5 {
     /* Garbage collector degli utenti in timeout */
     $ismod = FALSE;
     $curtime = time();
-    if ($force || $this->garbage_timeout < $curtime) {
-      
-      for ($i = 0 ; $i < BRISKIN5_MAX_PLAYERS ; $i++) {
+    // externalized if ($force || $this->garbage_timeout < $curtime) {
+    if ($force || Bin5::garbage_time_is_expired($curtime)) {
+      for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) {
        $user_cur = $this->user[$i];
        if ($user_cur->sess == "" || 
            ($user_cur->stat == 'table' && ($user_cur->subst == 'shutdowned' || $user_cur->subst == 'shutdowner')))
@@ -660,15 +661,17 @@ class Briskin5 {
 
       if ($table_token != "" && $bri->table_token != $table_token) {
        log_wr("bri->table_token: ".$bri->table_token."table_token: ".$table_token);
-       
        break;
       }
       $bri->tok = $tok;
 
       shm_detach($shm);
-       
-      $ret = &$bri;
-      return ($ret); 
+      
+      for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) {
+          $bri->user[$i] = Bin5_user::load_data($table_idx, $i, FALSE);
+      }
+      
+      return ($bri); 
     } while (FALSE);
 
     if ($shm != FALSE)
@@ -819,7 +822,7 @@ class Briskin5 {
       // change
       // update local graph
       // update remote graphs
-      for ($i = 0 ; $i < BRISKIN5_MAX_PLAYERS ; $i++) {
+      for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) {
        $user_cur = $this->user[$i];
        //      if ($user_cur->sess == '' || $user_cur->stat != 'room')
        if ($user_cur->sess == '')
@@ -833,7 +836,7 @@ class Briskin5 {
          break;
        }
       }
-      if ($i == BRISKIN5_MAX_PLAYERS) {
+      if ($i == BIN5_MAX_PLAYERS) {
         if ($user->flags & USER_FLAG_AUTH && strcasecmp($user->name,$name_new) != 0) {
           if ($this->table[$user->table]->auth_only == TRUE) {
             $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
@@ -851,7 +854,7 @@ class Briskin5 {
         log_main($user->sess." chatt_send start set");
        
 
-       for ($i = 0 ; $i < BRISKIN5_MAX_PLAYERS ; $i++) {
+       for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) {
          log_main($user->sess." chatt_send set loop");
          
          $user_cur = &$this->user[$i];
@@ -863,20 +866,20 @@ class Briskin5 {
            
            $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
            $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('set_names([%d, "%s"], [%d, "%s"], [%d, "%s"], [%d, "%s"], [%d, "%s"]); ',
-                      $this->user[$table->player[($user_cur->table_pos) % BRISKIN5_PLAYERS_N]]->flags,
-                      xcape($this->user[$table->player[($user_cur->table_pos) % BRISKIN5_PLAYERS_N]]->name),
+                      $this->user[$table->player[($user_cur->table_pos) % BIN5_PLAYERS_N]]->flags,
+                      xcape($this->user[$table->player[($user_cur->table_pos) % BIN5_PLAYERS_N]]->name),
 
-                      $this->user[$table->player[($user_cur->table_pos+1) % BRISKIN5_PLAYERS_N]]->flags,
-                      xcape($this->user[$table->player[($user_cur->table_pos+1) % BRISKIN5_PLAYERS_N]]->name),
+                      $this->user[$table->player[($user_cur->table_pos+1) % BIN5_PLAYERS_N]]->flags,
+                      xcape($this->user[$table->player[($user_cur->table_pos+1) % BIN5_PLAYERS_N]]->name),
 
-                      $this->user[$table->player[($user_cur->table_pos+2) % BRISKIN5_PLAYERS_N]]->flags,
-                      xcape($this->user[$table->player[($user_cur->table_pos+2) % BRISKIN5_PLAYERS_N]]->name),
+                      $this->user[$table->player[($user_cur->table_pos+2) % BIN5_PLAYERS_N]]->flags,
+                      xcape($this->user[$table->player[($user_cur->table_pos+2) % BIN5_PLAYERS_N]]->name),
 
-                      (BRISKIN5_PLAYERS_N == 3 ? 0:  $this->user[$table->player[($user_cur->table_pos+3) % BRISKIN5_PLAYERS_N]]->flags),
-                      (BRISKIN5_PLAYERS_N == 3 ? "" :  xcape($this->user[$table->player[($user_cur->table_pos+3) % BRISKIN5_PLAYERS_N]]->name)),
+                      (BIN5_PLAYERS_N == 3 ? 0:  $this->user[$table->player[($user_cur->table_pos+3) % BIN5_PLAYERS_N]]->flags),
+                      (BIN5_PLAYERS_N == 3 ? "" :  xcape($this->user[$table->player[($user_cur->table_pos+3) % BIN5_PLAYERS_N]]->name)),
 
-                      (BRISKIN5_PLAYERS_N == 3 ? 0:  $this->user[$table->player[($user_cur->table_pos+4) % BRISKIN5_PLAYERS_N]]->flags),
-                      (BRISKIN5_PLAYERS_N == 3 ? "" :  xcape($this->user[$table->player[($user_cur->table_pos+4) % BRISKIN5_PLAYERS_N]]->name)));
+                      (BIN5_PLAYERS_N == 3 ? 0:  $this->user[$table->player[($user_cur->table_pos+4) % BIN5_PLAYERS_N]]->flags),
+                      (BIN5_PLAYERS_N == 3 ? "" :  xcape($this->user[$table->player[($user_cur->table_pos+4) % BIN5_PLAYERS_N]]->name)));
            if ($user_cur == $user) {
               $itin = ($user->flags & USER_FLAG_AUTH ? "<i>" : "");
               $itou = ($user->flags & USER_FLAG_AUTH ? "</i>" : "");
@@ -889,7 +892,7 @@ class Briskin5 {
       }
     }
     else {
-      for ($i = 0 ; $i < ($user->stat == 'room' ? BRISKIN5_MAX_PLAYERS : BRISKIN5_PLAYERS_N) ; $i++) {
+      for ($i = 0 ; $i < ($user->stat == 'room' ? BIN5_MAX_PLAYERS : BIN5_PLAYERS_N) ; $i++) {
        if ($user->stat == 'room') {
          $user_cur = &$this->user[$i];
          if ($user_cur->sess == '' || $user_cur->stat != 'room')
@@ -912,11 +915,11 @@ class Briskin5 {
   {
     $table = &$this->table[0];
 
-    log_main("BRISKIN5_WAKEUP begin function table  stat: ".$user->stat."  subst: ".$user->subst);
+    log_main("BIN5_WAKEUP begin function table  stat: ".$user->stat."  subst: ".$user->subst);
 
     $curtime = time();
 
-    log_main("BRISKIN5_WAKEUP from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n);
+    log_main("BIN5_WAKEUP from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n);
     
     for ($i = 0 ; $i < $table->player_n ; $i++) {
       $user_cur = &$this->user[$i];
@@ -931,7 +934,7 @@ class Briskin5 {
       $ret = "gst.st = ".($user_cur->step+1)."; ";
       $ret .= 'gst.st_loc++; the_end=true; window.onbeforeunload = null; window.onunload = null; document.location.assign("../index.php");|';
 
-      log_wr($user_cur->sess." BRISKIN5_WAKEUP: ".$ret);
+      log_wr($user_cur->sess." BIN5_WAKEUP: ".$ret);
       $user_cur->comm[$user_cur->step % COMM_N] = $ret;
       $user_cur->step_inc();
     }
@@ -1013,7 +1016,7 @@ function calculate_points(&$table)
   $table->old_asta_pnt = $table->asta_pnt;
   $table->old_mult = $table->mult;
 
-  for ($i = 0 ; $i < (BRISKIN5_PLAYERS_N == 5 ? 40 : 24) ; $i++) {
+  for ($i = 0 ; $i < (BIN5_PLAYERS_N == 5 ? 40 : 24) ; $i++) {
     // for ($i = 0 ; $i < 40 ; $i++) {
     $ctt = $table->card[$i]->value % 10;
     $own = $table->card[$i]->owner;
@@ -1026,7 +1029,7 @@ function calculate_points(&$table)
   
   if ($table->asta_pnt == 61 && $pro == 60) { // PATTA !
     $table->points[$table->points_n % MAX_POINTS] = array();
-    for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+    for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
       $table->points[$table->points_n % MAX_POINTS][$i] = 0;
       $ret[$i] = 0;
     }
@@ -1045,7 +1048,7 @@ function calculate_points(&$table)
   $gamult = asta2mult($table->asta_pnt);
   
   $table->points[$table->points_n % MAX_POINTS] = array();
-  for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+  for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
     if ($i == $table->asta_win) 
       $pt = ($i == $table->friend ? 4 : 2);
     else if ($i == $table->friend) 
@@ -1106,20 +1109,20 @@ function show_table(&$room, &$user, $sendstep, $is_transition, $is_again)
 
     $ret .= sprintf('$("myname").innerHTML = "<b>%s%s%s</b>";', $itin, xcape($user->name), $itou);
     $ret .= sprintf('set_names([%d, "%s"], [%d, "%s"], [%d, "%s"], [%d, "%s"], [%d, "%s"]); ',
-                   $room->user[$table->player[($table_pos) % BRISKIN5_PLAYERS_N]]->flags,
-                   xcape($room->user[$table->player[($table_pos) % BRISKIN5_PLAYERS_N]]->name),
+                   $room->user[$table->player[($table_pos) % BIN5_PLAYERS_N]]->flags,
+                   xcape($room->user[$table->player[($table_pos) % BIN5_PLAYERS_N]]->name),
 
-                   $room->user[$table->player[($table_pos+1) % BRISKIN5_PLAYERS_N]]->flags,
-                   xcape($room->user[$table->player[($table_pos+1) % BRISKIN5_PLAYERS_N]]->name),
+                   $room->user[$table->player[($table_pos+1) % BIN5_PLAYERS_N]]->flags,
+                   xcape($room->user[$table->player[($table_pos+1) % BIN5_PLAYERS_N]]->name),
 
-                   $room->user[$table->player[($table_pos+2) % BRISKIN5_PLAYERS_N]]->flags,
-                   xcape($room->user[$table->player[($table_pos+2) % BRISKIN5_PLAYERS_N]]->name),
+                   $room->user[$table->player[($table_pos+2) % BIN5_PLAYERS_N]]->flags,
+                   xcape($room->user[$table->player[($table_pos+2) % BIN5_PLAYERS_N]]->name),
 
-                   (BRISKIN5_PLAYERS_N == 3 ? 0 : $room->user[$table->player[($table_pos+3) % BRISKIN5_PLAYERS_N]]->flags),
-                   (BRISKIN5_PLAYERS_N == 3 ? "" :  xcape($room->user[$table->player[($table_pos+3) % BRISKIN5_PLAYERS_N]]->name)),
+                   (BIN5_PLAYERS_N == 3 ? 0 : $room->user[$table->player[($table_pos+3) % BIN5_PLAYERS_N]]->flags),
+                   (BIN5_PLAYERS_N == 3 ? "" :  xcape($room->user[$table->player[($table_pos+3) % BIN5_PLAYERS_N]]->name)),
 
-                   (BRISKIN5_PLAYERS_N == 3 ? 0 : $room->user[$table->player[($table_pos+4) % BRISKIN5_PLAYERS_N]]->flags),
-                   (BRISKIN5_PLAYERS_N == 3 ? "" :  xcape($room->user[$table->player[($table_pos+4) % BRISKIN5_PLAYERS_N]]->name)));
+                   (BIN5_PLAYERS_N == 3 ? 0 : $room->user[$table->player[($table_pos+4) % BIN5_PLAYERS_N]]->flags),
+                   (BIN5_PLAYERS_N == 3 ? "" :  xcape($room->user[$table->player[($table_pos+4) % BIN5_PLAYERS_N]]->name)));
   }
   /* NOTIFY FOR THE CARD MAKER */
   if ($is_transition) { //  && $user->subst ==  "asta" superfluo
@@ -1138,11 +1141,11 @@ function show_table(&$room, &$user, $sendstep, $is_transition, $is_again)
     $ret .= "|";
     
     for ($i = 0 ; $i < 8 ; $i++) {
-      for ($e = 0 ; $e < BRISKIN5_PLAYERS_N ; $e++) {
+      for ($e = 0 ; $e < BIN5_PLAYERS_N ; $e++) {
        $ct = 0;
-        for ($o = 0 ; $o < (BRISKIN5_PLAYERS_N == 5 ? 40 : 24) && $ct < $i+1 ; $o++) {
+        for ($o = 0 ; $o < (BIN5_PLAYERS_N == 5 ? 40 : 24) && $ct < $i+1 ; $o++) {
           // for ($o = 0 ; $o < 40 && $ct < $i+1 ; $o++) {
-         if ($table->card[$o]->owner == (($e + $table->gstart) % BRISKIN5_PLAYERS_N)) {
+         if ($table->card[$o]->owner == (($e + $table->gstart) % BIN5_PLAYERS_N)) {
            $ct++;
            if ($ct == $i+1)
              break;
@@ -1150,10 +1153,10 @@ function show_table(&$room, &$user, $sendstep, $is_transition, $is_again)
        }
        log_rd("O ".$o." VAL ".$table->card[$o]->value." Owner: ".$table->card[$o]->owner);
        
-       $ret .= sprintf( ' card_send(%d,%d,%d,%8.2f,%d);|', ($table->gstart + $e) % BRISKIN5_PLAYERS_N, 
-                        $i, ((($e + BRISKIN5_PLAYERS_N - $table_pos + $table->gstart) % BRISKIN5_PLAYERS_N) == 0 ?
+       $ret .= sprintf( ' card_send(%d,%d,%d,%8.2f,%d);|', ($table->gstart + $e) % BIN5_PLAYERS_N, 
+                        $i, ((($e + BIN5_PLAYERS_N - $table_pos + $table->gstart) % BIN5_PLAYERS_N) == 0 ?
                              $table->card[$o]->value : -1), 
-                        ($i == 7 && $e == (BRISKIN5_PLAYERS_N - 1) ? 1 : 0.5),$i+1);
+                        ($i == 7 && $e == (BIN5_PLAYERS_N - 1) ? 1 : 0.5),$i+1);
       }
     }    
   }
@@ -1163,7 +1166,7 @@ function show_table(&$room, &$user, $sendstep, $is_transition, $is_again)
     $ontabl  = array(-1,-1,-1,-1,-1);
     $cards  = array();
 
-    for ($i = 0 ; $i < (BRISKIN5_PLAYERS_N == 5 ? 40 : 24) ; $i++) {
+    for ($i = 0 ; $i < (BIN5_PLAYERS_N == 5 ? 40 : 24) ; $i++) {
       // for ($i = 0 ; $i < 40 ; $i++) {
       if ($table->card[$i]->stat == 'hand') {
        if ($table->card[$i]->owner == $table_pos) {
@@ -1180,7 +1183,7 @@ function show_table(&$room, &$user, $sendstep, $is_transition, $is_again)
       }
     }
     $logg = "\n";
-    for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+    for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
       $logg .= sprintf("INHAND: %d   IN TABLE %d   TAKED %d\n", $inhand[$i], $ontabl[$i], $taked[$i]);
     }
     log_main("Stat table: ".$logg);
@@ -1194,7 +1197,7 @@ function show_table(&$room, &$user, $sendstep, $is_transition, $is_again)
     $ret .= sprintf('card_setours(%s);', $oursarg);
 
     /* Dispose all cards */
-    for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+    for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
       /* Qui sotto al posto di + 1 c'era + ->gstart ... credo in modo errato */
       $ret .= sprintf('cards_dispose(%d,%d,%d);', $i,
                      ($inhand[$i] <= 8 ? $inhand[$i] : 8)  , $taked[$i]);
@@ -1212,12 +1215,12 @@ function show_table(&$room, &$user, $sendstep, $is_transition, $is_again)
 
     /* show users auction status */
     $showst = "";
-    for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+    for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
       $user_cur = &$room->user[$table->player[$i]];
       $showst .= sprintf("%s%d", ($i == 0 ? "" : ", "), 
                         ($user_cur->asta_card < 9 ? $user_cur->asta_card : $user_cur->asta_pnt));
     }
-    if (BRISKIN5_PLAYERS_N == 3)
+    if (BIN5_PLAYERS_N == 3)
        $showst .= ",-2,-2";
     $ret .= sprintf('document.title = "Brisk - Tavolo %d (asta)";', $user->table_orig);
     $ret .= sprintf('show_astat(%s);', $showst);
@@ -1229,7 +1232,7 @@ function show_table(&$room, &$user, $sendstep, $is_transition, $is_again)
     }
     else {
       /* show auction */
-      if ($table_pos == ($table->gstart % BRISKIN5_PLAYERS_N) &&
+      if ($table_pos == ($table->gstart % BIN5_PLAYERS_N) &&
          $table->asta_win == -1) 
        $ret .= sprintf('dispose_asta(%d,%d, %s);', 
                        $table->asta_card + 1, $table->asta_pnt+1, ($user->handpt <= 2 ? "true" : "false"));
@@ -1240,7 +1243,7 @@ function show_table(&$room, &$user, $sendstep, $is_transition, $is_again)
 
     /* Remark */
     if ($table->asta_win == -1) { // auction case
-      if ($table_pos == ($table->gstart % BRISKIN5_PLAYERS_N)) 
+      if ($table_pos == ($table->gstart % BIN5_PLAYERS_N)) 
        $ret .= "remark_on();";
       else
        $ret .= "remark_off();";
@@ -1254,7 +1257,7 @@ function show_table(&$room, &$user, $sendstep, $is_transition, $is_again)
   }
   else if ($user->subst == 'game') {
     /* HIGHLIGHT */
-    if (($table->gstart + $table->turn) % BRISKIN5_PLAYERS_N == $table_pos) 
+    if (($table->gstart + $table->turn) % BIN5_PLAYERS_N == $table_pos) 
       $ret .= "is_my_time = true; remark_on();";
     else
       $ret .= "remark_off();";
@@ -1275,7 +1278,7 @@ function calculate_winner(&$table)
   $cur_val  = 100;
   $cur_seed = $table->briscola - ($table->briscola % 10);
 
-  for ($i = 0 ; $i < (BRISKIN5_PLAYERS_N == 5 ? 40 : 24) ; $i++) {
+  for ($i = 0 ; $i < (BIN5_PLAYERS_N == 5 ? 40 : 24) ; $i++) {
     // for ($i = 0 ; $i < 40 ; $i++) {
     if ($table->card[$i]->stat != "table")
       continue;
@@ -1296,7 +1299,7 @@ function calculate_winner(&$table)
     $cur_seed = $cur_val - ($cur_val % 10);
   }
 
-  for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+  for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
     if (($ontab[$i] - ($ontab[$i] % 10)) == $cur_seed) {
       if ($ontab[$i] < $cur_val) {
        $cur_val = $ontab[$i];
@@ -1305,7 +1308,7 @@ function calculate_winner(&$table)
     }
   }
 
-  for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+  for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
     $table->card[$ontid[$i]]->owner = $cur_win;
     $table->card[$ontid[$i]]->stat =  "take"; // Card stat
   }
@@ -1323,7 +1326,7 @@ function show_table_info(&$room, &$table, $table_pos)
   $noty = sprintf('<table class=\"points\"><tr><th></th>');
   
   // Names.
-  for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) 
+  for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) 
     $noty .= sprintf('<th class=\"td_points\">%s</th>', xcape($room->user[$table->player[$i]]->name));
   $noty .= sprintf("</tr>");
 
@@ -1332,14 +1335,14 @@ function show_table_info(&$room, &$table, $table_pos)
 
   for ($i = $pnt_min ; $i < $table->points_n ; $i++) {
     $noty .= sprintf('<tr><th class=\"td_points\">%d</th>', $i+1);
-    for ($e = 0 ; $e < BRISKIN5_PLAYERS_N ; $e++) 
+    for ($e = 0 ; $e < BIN5_PLAYERS_N ; $e++) 
       $noty .= sprintf('<td class=\"td_points\">%d</td>', $table->points[$i % MAX_POINTS][$e]);
     $noty .= "</tr>";
   }
 
   // Total points.
   $noty .= '<tr><th class=\"td_points\">Tot.</th>';
-  for ($e = 0 ; $e < BRISKIN5_PLAYERS_N ; $e++) 
+  for ($e = 0 ; $e < BIN5_PLAYERS_N ; $e++) 
     $noty .= sprintf('<td class=\"td_points\">%d</td>', $table->total[$e]);
   $noty .= "</tr></table>";
 
@@ -1401,12 +1404,12 @@ function show_table_info(&$room, &$table, $table_pos)
 
   if ($user->subst == 'asta') {
     if ($table->asta_win == -1)  // auction case
-      $curplayer = $table->gstart % BRISKIN5_PLAYERS_N;
+      $curplayer = $table->gstart % BIN5_PLAYERS_N;
     else 
       $curplayer = $table->asta_win;
   }
   else if ($user->subst == 'game') {
-    $curplayer = ($table->gstart + $table->turn) % BRISKIN5_PLAYERS_N;
+    $curplayer = ($table->gstart + $table->turn) % BIN5_PLAYERS_N;
   }
 
   /* MLANG: " tocca a <b>te</b> giocare.", " tocca a <b>$unam</b> giocare.", " La partita vale <b>%s</b>.", "torna alla partita" */
@@ -1464,7 +1467,7 @@ function briscola_show($room, $table, $user)
     $ret .= sprintf($prestr, 
                    xcape($room->user[$table->player[$table->asta_win]]->name), $ptnadd);
   }
-  $ret .= sprintf('set_iscalling(%d);', ($table->asta_win - $user->table_pos + BRISKIN5_PLAYERS_N) % BRISKIN5_PLAYERS_N);
+  $ret .= sprintf('set_iscalling(%d);', ($table->asta_win - $user->table_pos + BIN5_PLAYERS_N) % BIN5_PLAYERS_N);
 
   $ret .= sprintf('$("caller").style.backgroundImage = \'url("img/brisk_caller_sand%d.png")\';',
                  $table->asta_win);

diff --git a/web/briskin5/index_wr.php b/web/briskin5/index_wr.php
index 1c0735e..5a2644f 100644 (file)
--- a/web/briskin5/index_wr.php
+++ b/web/briskin5/index_wr.php
@@ -52,19 +52,19 @@ if ($table_idx < 0 || $table_idx >= TABLE_N)
 
 log_mop(0, 'bin::index_wr.php: COMM: '.xcapemesg($mesg));
 
-$sem = Briskin5::lock_data($table_idx);
+$sem = Bin5::lock_data($table_idx);
 
-if (($bri = &Briskin5::load_data($table_idx,$table_token)) == FALSE) {
+if (($bri = &Bin5::load_data($table_idx,$table_token)) == FALSE) {
   echo "Bin5 Load data error";
   log_wr("Bin5 Load data error");
-  Briskin5::unlock_data($sem);
+  Bin5::unlock_data($sem);
   exit;
 }
 
 if (($user = &$bri->get_user($sess, &$idx)) == FALSE) {
   echo "Get User Error";
   log_wr("Get User Error");
-  Briskin5::unlock_data($sem);
+  Bin5::unlock_data($sem);
   exit;
 }
 $argz = explode('|', $mesg);
@@ -148,12 +148,12 @@ else if ($user->stat == 'table') {
   else if ($argz[0] == 'exitlock') {
     if ($user->exitislock == TRUE) {
       $user->exitislock = ($user->exitislock == TRUE ? FALSE : TRUE);
-      for ($ct = 0, $i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) { 
+      for ($ct = 0, $i = 0 ; $i < BIN5_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++) {
+      for ($i = 0 ; $i < BIN5_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'));
@@ -165,7 +165,7 @@ else if ($user->stat == 'table') {
   }
   else if ($user->subst == 'asta') {
     if ($argz[0] == 'lascio' && $user->handpt <= 2) {
-      $index_cur = $table->gstart % BRISKIN5_PLAYERS_N;
+      $index_cur = $table->gstart % BIN5_PLAYERS_N;
     
       log_wr(sprintf("GIOCO FINITO !!!"));
     
@@ -175,7 +175,7 @@ else if ($user->stat == 'table') {
       $table->game_next();
       $table->game_init(&$bri->user);
     
-      for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {  
+      for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {      
        $user_cur = &$bri->user[$table->player[$i]];
 
        $ret = sprintf('gst.st = %d;', $user_cur->step+1);
@@ -187,7 +187,7 @@ else if ($user->stat == 'table') {
     else if ($argz[0] == 'asta') {
       $again = TRUE;
     
-      $index_cur = $table->gstart % BRISKIN5_PLAYERS_N;
+      $index_cur = $table->gstart % BIN5_PLAYERS_N;
       if ($user->table_pos == $index_cur &&
          $table->asta_pla[$index_cur]) {
        $a_card = $argz[1];
@@ -234,17 +234,17 @@ else if ($user->stat == 'table') {
        else {
          /* next step */
          $showst = "show_astat("; 
-         for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+         for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
            $user_cur = &$bri->user[$table->player[$i]];
            $showst .= sprintf("%s%d", ($i == 0 ? "" : ", "), 
                               ($user_cur->asta_card < 9 ? $user_cur->asta_card : $user_cur->asta_pnt));
          }
-         if (BRISKIN5_PLAYERS_N == 3)
+         if (BIN5_PLAYERS_N == 3)
            $showst .= ",-2,-2";
          $showst .= ");";
 
          $maxcard = -2;
-         for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+         for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
            $user_cur = &$bri->user[$table->player[$i]];
            if ($maxcard < $user_cur->asta_card)
              $maxcard = $user_cur->asta_card;
@@ -253,8 +253,8 @@ else if ($user->stat == 'table') {
          if (($table->asta_pla_n > ($maxcard > -1 ? 1 : 0)) &&
              !($table->asta_card == 9 && $table->asta_pnt == 120)) {
            log_wr("ALLOPPA QUI");
-           for ($i = 1 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
-             $index_next = ($table->gstart + $i) % BRISKIN5_PLAYERS_N;
+           for ($i = 1 ; $i < BIN5_PLAYERS_N ; $i++) {
+             $index_next = ($table->gstart + $i) % BIN5_PLAYERS_N;
              if ($table->asta_pla[$index_next]) {
                log_wr("GSTART 1");
                $table->gstart += $i;
@@ -263,10 +263,10 @@ else if ($user->stat == 'table') {
            }
          
          
-           for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+           for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
              $user_cur = &$bri->user[$table->player[$i]];
              $ret = sprintf('gst.st = %d; %s', $user_cur->step+1, $showst);
-             if ($user_cur->table_pos == ($table->gstart % BRISKIN5_PLAYERS_N)) 
+             if ($user_cur->table_pos == ($table->gstart % BIN5_PLAYERS_N)) 
                $ret .= sprintf('dispose_asta(%d,%d, %s); remark_on();', 
                                $table->asta_card + 1, $table->asta_pnt+1, ($user_cur->handpt <= 2 ? "true" : "false"));
              else
@@ -287,7 +287,7 @@ else if ($user->stat == 'table') {
            $table->game_next();
            $table->game_init(&$bri->user);
          
-           for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {     
+           for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) { 
              $user_cur = &$bri->user[$table->player[$i]];
 
              $ret = sprintf('gst.st = %d;', $user_cur->step+1);
@@ -301,7 +301,7 @@ else if ($user->stat == 'table') {
            // if a_pnt == 120 supergame ! else abbandono
            if ($a_pnt == 120 || $user->asta_card != -1) {
              $chooser = $index_cur;
-             for ($i = 1 ; $i < BRISKIN5_PLAYERS_N ; $i++) 
+             for ($i = 1 ; $i < BIN5_PLAYERS_N ; $i++) 
                if ($i != $chooser)
                  $table->asta_pla[$i] = FALSE;
            }
@@ -311,8 +311,8 @@ else if ($user->stat == 'table') {
                                                            $user->step+1, $table->asta_card + 1,-($table->asta_pnt));
              $user->step_inc();
               */
-             for ($i = 1 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
-               $chooser = ($table->gstart + $i) % BRISKIN5_PLAYERS_N;
+             for ($i = 1 ; $i < BIN5_PLAYERS_N ; $i++) {
+               $chooser = ($table->gstart + $i) % BIN5_PLAYERS_N;
                if ($table->asta_pla[$chooser]) {
                  break;
                }
@@ -320,7 +320,7 @@ else if ($user->stat == 'table') {
            }
            $table->asta_win = $chooser;
 
-           for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+           for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
              $user_cur = &$bri->user[$table->player[$i]];
              $ret = sprintf('gst.st = %d; %s dispose_asta(%d, %d, false);', $user_cur->step+1, $showst,
                              $table->asta_card + 1,-($table->asta_pnt));
@@ -347,16 +347,16 @@ 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 < (BRISKIN5_PLAYERS_N == 5 ? 40 : 24)) {
+       if ($a_brisco >= 0 && $a_brisco < (BIN5_PLAYERS_N == 5 ? 40 : 24)) {
          $table->briscola = $a_brisco;
          $table->friend   = $table->card[$a_brisco]->owner;
          log_wr("GSTART 2");
-         $table->gstart = ($table->mazzo+1) % BRISKIN5_PLAYERS_N;
+         $table->gstart = ($table->mazzo+1) % BIN5_PLAYERS_N;
          log_wr("Setta la briscola a ".$a_brisco);
 
          $chooser = $table->asta_win;
          $user_chooser = &$bri->user[$table->player[$chooser]];
-         for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+         for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
            $user_cur = &$bri->user[$table->player[$i]];
            $user_cur->subst = 'game';
            $ret = sprintf('gst.st = %d; subst = "game";', $user_cur->step+1);
@@ -371,7 +371,7 @@ else if ($user->stat == 'table') {
            $ret .= briscola_show($bri, $table, $user_cur);
 
            /* first gamer */
-           if ($i == ($table->gstart % BRISKIN5_PLAYERS_N))
+           if ($i == ($table->gstart % BIN5_PLAYERS_N))
              $ret .= "is_my_time = true; remark_on();";
            else
              $ret .= "is_my_time = false; remark_off();";
@@ -402,14 +402,14 @@ else if ($user->stat == 'table') {
        $a_y = substr($a_y,0,-2);
 
       $loggo = sprintf("A_play %s, table_pos %d == %d, mazzo %d, gstart %d, card_stat %d, card_own %d",
-                      $a_play, $user->table_pos, ($table->gstart % BRISKIN5_PLAYERS_N),
+                      $a_play, $user->table_pos, ($table->gstart % BIN5_PLAYERS_N),
                       $table->mazzo, $table->gstart,
                       $table->card[$a_play]->stat, $table->card[$a_play]->owner);
       log_wr("CIC".$loggo);
                          
       /* se era il suo turno e la carta era sua ed era in mano */
-      if ($a_play >=0 && $a_play < (BRISKIN5_PLAYERS_N == 5 ? 40 : 24) &&
-         ($user->table_pos == (($table->gstart + $table->turn) % BRISKIN5_PLAYERS_N)) &&
+      if ($a_play >=0 && $a_play < (BIN5_PLAYERS_N == 5 ? 40 : 24) &&
+         ($user->table_pos == (($table->gstart + $table->turn) % BIN5_PLAYERS_N)) &&
          $table->card[$a_play]->stat == 'hand' &&
          $table->card[$a_play]->owner == $user->table_pos) {
        log_wr(sprintf("User: %s Play: %d",$user->name, $a_play));
@@ -420,23 +420,23 @@ else if ($user->stat == 'table') {
        /*
         *  !!!! TURN INCREMENTED BEFORE !!!!
         */
-       $turn_cur = ($table->gstart + $table->turn) % BRISKIN5_PLAYERS_N;
+       $turn_cur = ($table->gstart + $table->turn) % BIN5_PLAYERS_N;
        $table->turn++;
 
        $card_play = sprintf("card_play(%d,%d,%d,%d);|",
                             $user->table_pos, $a_play, $a_x, $a_y);
-       if (($table->turn % BRISKIN5_PLAYERS_N) != 0) {     /* manche not finished */
-         $turn_nex = ($table->gstart + $table->turn) % BRISKIN5_PLAYERS_N;
+       if (($table->turn % BIN5_PLAYERS_N) != 0) {     /* manche not finished */
+         $turn_nex = ($table->gstart + $table->turn) % BIN5_PLAYERS_N;
 
          $player_cur = "remark_off();";
          $player_nex = $card_play . "is_my_time = true; remark_on();";
          $player_oth = $card_play;
        }
-       else if ($table->turn <= (BRISKIN5_PLAYERS_N * 8)) { /* manche finished */
+       else if ($table->turn <= (BIN5_PLAYERS_N * 8)) { /* manche finished */
          $winner = calculate_winner($table);
          log_wr("GSTART 3");
          $table->gstart = $winner;
-         $turn_nex = ($table->gstart + $table->turn) % BRISKIN5_PLAYERS_N;
+         $turn_nex = ($table->gstart + $table->turn) % BIN5_PLAYERS_N;
 
          log_wr(sprintf("The winner is: [%d] [%s]", $winner, $bri->user[$table->player[$winner]]->name));
          $card_take = sprintf("sleep(gst,2000);|cards_take(%d);|", $winner);
@@ -445,13 +445,13 @@ else if ($user->stat == 'table') {
            $player_nex = $card_play . $card_take;
          else
            $player_nex = "";
-         if ($table->turn < (BRISKIN5_PLAYERS_N * 8))  /* game NOT finished */
+         if ($table->turn < (BIN5_PLAYERS_N * 8))  /* game NOT finished */
            $player_nex .= "is_my_time = true; remark_on();";
          $player_oth = $card_play . $card_take;
        }
 
        log_wr(sprintf("Turn Cur %d Turn Nex %d",$turn_cur, $turn_nex));
-       for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) { 
+       for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {     
          $user_cur = &$bri->user[$table->player[$i]];
 
          $ret = sprintf('gst.st = %d; ', $user_cur->step+1);
@@ -470,7 +470,7 @@ else if ($user->stat == 'table') {
          $retar[$i] = $ret;
        }
 
-       if ($table->turn == (BRISKIN5_PLAYERS_N * 8)) { /* game finished */
+       if ($table->turn == (BIN5_PLAYERS_N * 8)) { /* game finished */
          log_wr(sprintf("GIOCO FINITO !!!"));
 
 
@@ -482,12 +482,12 @@ else if ($user->stat == 'table') {
           $plist = "$table->table_token|$user->table_orig|$table->player_n";
           $curtime = time();
           $ucodes = array();
-          for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+          for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
             $user_cur = &$bri->user[$table->player[$i]];
             $plist .= '|'.xcapelt($user_cur->name).'|'.$pt_cur[$i];
             $ucodes[$i] = $user_cur->code_get();
           }
-          for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+          for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
             $plist .= '|'.xcapelt($ucodes[$i]);
           }
           log_legal($curtime, $user, "STAT:BRISKIN5:FINISH_GAME", $plist);
@@ -507,14 +507,14 @@ else if ($user->stat == 'table') {
          $table->game_next();
          $table->game_init(&$bri->user);
          
-         for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+         for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
            $user_cur = &$bri->user[$table->player[$i]];
            $retar[$i] .= show_table(&$bri,&$user_cur,$user_cur->step+1,TRUE, TRUE);
          }
        }
 
 
-       for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) { 
+       for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {     
          $user_cur = &$bri->user[$table->player[$i]];
        
          $user_cur->comm[$user_cur->step % COMM_N] = $retar[$i];
@@ -533,9 +533,9 @@ else if ($user->stat == 'table') {
   }
 }
 log_wr("before save data");
-Briskin5::save_data($bri);
+Bin5::save_data($bri);
 log_mop($user->step, 'bin::index_wr.php: after save_data()');
 
-Briskin5::unlock_data($sem);
+Bin5::unlock_data($sem);
 exit;
 ?>

diff --git a/web/briskin5/statadm.php b/web/briskin5/statadm.php
index 07b847e..c40a2e2 100644 (file)
--- a/web/briskin5/statadm.php
+++ b/web/briskin5/statadm.php
@@ -100,12 +100,12 @@ function main_file($curtime)
       
       continue;
     }
-    // echo $p++." ".BRISKIN5_PLAYERS_N."<br>";
+    // echo $p++." ".BIN5_PLAYERS_N."<br>";
     
     $found = FALSE;
     $mult = 1;
-    for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
-      for ($e = $i + 1 ; $e < BRISKIN5_PLAYERS_N ; $e++) {
+    for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
+      for ($e = $i + 1 ; $e < BIN5_PLAYERS_N ; $e++) {
         if ($ar[10+($i*2)] == $ar[10+($e*2)]) {
           $mult = abs($ar[10+($i*2)]);
           $found = TRUE;
@@ -117,7 +117,7 @@ function main_file($curtime)
 
     if ($mult == 0)
        continue;
-    for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
+    for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
       // echo $p." i) ".$i."<br>";
       $username = $ar[9+($i*2)];
       if (($item = $bdb->getitem_bylogin($username, &$id)) == FALSE) {

diff --git a/web/index_wr.php b/web/index_wr.php
index 50fed58..430a6fc 100644 (file)
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -494,7 +494,7 @@ else if ($user->stat == 'room') {
   else if ($user->subst == 'standup') {
    
     if ($argz[0] == 'sitdown') {
-      log_wr("SITDOWN command");
+        log_wr("SITDOWN command");
 
       if ($user->the_end == TRUE) {
        log_wr("INFO:SKIP:argz == sitdown && the_end == TRUE => ignore request.");
@@ -571,7 +571,7 @@ else if ($user->stat == 'room') {
        //
 
         // Create new spawned table
-        $bri_sem = Briskin5::lock_data($table_idx);
+        $bri_sem = Bin5::lock_data($table_idx);
         $table_token = uniqid("");
         $room->table[$table_idx]->table_token = $table_token;
         $room->table[$table_idx]->table_start = $curtime;
@@ -609,7 +609,6 @@ else if ($user->stat == 'room') {
           $bri_user_cur->comm[$bri_user_cur->step % COMM_N] = "";
           $bri_user_cur->step_inc();
           $bri_user_cur->comm[$bri_user_cur->step % COMM_N] = show_table(&$bri,&$bri_user_cur,$bri_user_cur->step+1,TRUE, FALSE);
-          
           $bri_user_cur->step_inc();
           
           log_wr("TRY PRESAVE: ".$bri_user_cur->step." TRANS STEP: ".$bri_user_cur->trans_step);
@@ -627,15 +626,14 @@ else if ($user->stat == 'room') {
           $user_cur->trans_step = $user_cur->step + 1;
           log_wr("TRANS ATTIVATO");
           
-          
           $user_cur->stat_set('table');
           $user_cur->subst = 'asta';
           $user_cur->laccwr = $curtime;
           $user_cur->step_inc();
         }
         log_wr("presave bri");
-        Briskin5::save_data($bri);
-        Briskin5::unlock_data($bri_sem);
+        Bin5::save_data($bri);
+        Bin5::unlock_data($bri_sem);
         log_wr("postsave bri");
       }
       // change room