alzato prima di uscire

diff --git a/web/index_wr.php b/web/index_wr.php
index 8ffec23..6f738b6 100644 (file)
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -46,9 +46,8 @@ $argz = explode('|', $mesg);
 
 if ($argz[0] == 'shutdown') {
   log_auth($user_cur->sess, "Shutdown session.");
-  $tmp_sess = $user->sess;
+  
   $user->sess = "";
-  step_unproxy($tmp_sess);
   $user->name = "";
   $user->the_end = FALSE;
   
@@ -60,6 +59,11 @@ if ($argz[0] == 'shutdown') {
   else
     log_rd2($sess, "SHUTDOWN FROM WHAT ???");
 }
+/******************
+ *                *
+ *   STAT: room   *
+ *                *
+ ******************/
 else if ($user->stat == 'room') {
   $user->laccwr = time();
 
@@ -68,7 +72,7 @@ else if ($user->stat == 'room') {
     $user->comm[$user->step % COMM_N] .=  show_notify(str_replace("\n", " ", $G_room_help), 0, "torna ai tavoli", 600, 500);
 
     log_wr($sess, $user->comm[$user->step % COMM_N]);
-    $user->step_inc();
+    $user->step++;
     
   }
   else if ($argz[0] == 'about') {
@@ -76,18 +80,19 @@ else if ($user->stat == 'room') {
     $user->comm[$user->step % COMM_N] .=  show_notify(str_replace("\n", " ", $G_room_about), 0, "torna ai tavoli", 400, 200);
 
     log_wr($sess, $user->comm[$user->step % COMM_N]);
-    $user->step_inc();
+    $user->step++;
     
   }
-  else if ($argz[0] == 'logout') {
+  /*  else if ($argz[0] == 'logout') {
     $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
     $user->comm[$user->step % COMM_N] .= sprintf('postact_logout();');
     $user->the_end = TRUE;
-    $user->step_inc();
-  }
+    $user->step++;
+  }*/
   else if ($argz[0] == 'chatt') {
     $bri->chatt_send(&$user,$mesg);
   }
+  /*
   else if ($argz[0] == 'sitdown') {
     if ($user->stat != 'room' || $user->subst != 'standup') {
       log_wr($sess, "Warning ! sitdown out fsm");
@@ -95,12 +100,11 @@ else if ($user->stat == 'room') {
       exit;
     }
                
-    // BAN_IP_CHECK
     if ($user->bantime > $user->laccwr) {
       $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
-      $user->comm[$user->step % COMM_N] .= show_notify("<br>Ti sei alzato da un tavolo senza il consenso degli altri giocatori. Dovrai aspettare ancora ".secstoword($user->bantime - $user->laccwr)." prima di poterti sedere nuovamente.", 2000, "Torna in piedi.", 400, 100);
+            $user->comm[$user->step % COMM_N] .= show_notify("<br>Ti sei alzato da un tavolo senza il consenso degli altri giocatori. Dovrai aspettare ancora ".secstoword($user->bantime - $user->laccwr)." prima di poterti sedere nuovamente.", 2000, "Torna in piedi.", 400, 100);
       
-      $user->step_inc();
+      $user->step++;
       save_data($bri);
       unlock_data($sem);
       exit;
@@ -140,18 +144,20 @@ else if ($user->stat == 'room') {
        $user_cur->trans_step = $user_cur->step + 1;
        log_wr($sess, "TRANS ATTIVATO");
        
-       $user_cur->stat_set('table');
+       $user_cur->stat =  'table';
        $user_cur->subst = 'asta';
        $user_cur->laccwr = $curtime;
-       $user_cur->step_inc();
+       $user_cur->step++;
        
        $user_cur->comm[$user_cur->step % COMM_N] = show_table(&$bri,&$user_cur,$user_cur->step+1,TRUE, FALSE);
-       $user_cur->step_inc();
+       $user_cur->step++;
       }
     }
                
-    $bri->room_sitdown(&$user, $table_idx);
+    $bri->room_sitdown(&$user, $table_idx); // COMMENTED
   }
+  */
+  /*
   else if ($argz[0] == 'wakeup') {
     if ($user->stat != 'room' || $user->subst != 'sitdown') {
       log_wr($sess, "Warning ! wakeup out fsm.");
@@ -160,17 +166,111 @@ else if ($user->stat == 'room') {
     }
                
     // set new status
-
     $user->subst = "standup";
 
     $bri->room_wakeup(&$user);
   }
+  */
+  /**********************
+   *                    *
+   *   SUBST: standup   *
+   *                    *
+   **********************/
+  else if ($user->subst == 'standup') {
+   
+    if ($argz[0] == 'sitdown') {
+      if ($user->the_end == TRUE) {
+       log_wr($sess, "INFO:SKIP:argz == sitdown && the_end == TRUE => ignore request.");
+       unlock_data($sem);
+       exit;
+      }
+      /* TODO: refact to a function */
+      if ($user->bantime > $user->laccwr) {
+       $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
+       $user->comm[$user->step % COMM_N] .= show_notify("<br>Ti sei alzato da un tavolo senza il consenso degli altri giocatori. Dovrai aspettare ancora ".secstoword($user->bantime - $user->laccwr)." prima di poterti sedere nuovamente.", 2000, "Torna in piedi.", 400, 100);
+       
+       $user->step++;
+       save_data($bri);
+       unlock_data($sem);
+       exit;
+      }
+    
+      // Take parameters
+      $table_idx = $argz[1];
+      $table = &$bri->table[$table_idx];
+    
+      if ($table->player_n == PLAYERS_N) {
+       log_wr($sess, "WARN:FSM: Sitdown unreachable, table full.");
+       unlock_data($sem);
+       exit;
+      } 
+
+      // set new status
+      $user->subst = "sitdown";
+      $user->table = $table_idx;
+      $user->table_pos = $table->user_add($idx);
+      
+      if ($table->player_n == PLAYERS_N) {
+       // Start game for this table.
+       log_wr($sess, "Start game!");
+       
+       $table->init(&$bri->user);
+       $table->game_init(&$bri->user);
+       $curtime = time();
+       
+       for ($i = 0 ; $i < $table->player_n ; $i++) {
+         $user_cur = &$bri->user[$table->player[$i]];
+         log_wr($sess, "Pre if!");
+         
+         $ret = "";
+         $ret .= sprintf('gst.st_loc++; gst.st=%d; the_end=true; window.onunload = null ; document.location.assign("table.php");|', $user_cur->step+1);
+         
+         $user_cur->comm[$user_cur->step % COMM_N] = $ret;
+         $user_cur->trans_step = $user_cur->step + 1;
+         log_wr($sess, "TRANS ATTIVATO");
+         
+         $user_cur->stat =  'table';
+         $user_cur->subst = 'asta';
+         $user_cur->laccwr = $curtime;
+         $user_cur->step++;
+         
+         $user_cur->comm[$user_cur->step % COMM_N] = show_table(&$bri,&$user_cur,$user_cur->step+1,TRUE, FALSE);
+         $user_cur->step++;
+       }
+      }
+      
+      $bri->room_sitdown(&$user, $table_idx);
+    }
+    else if ($argz[0] == 'logout') {
+      $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
+      $user->comm[$user->step % COMM_N] .= sprintf('postact_logout();');
+      $user->the_end = TRUE;
+      $user->step++;
+    }
+  }
+  /**********************
+   *                    *
+   *   SUBST: sitdown   *
+   *                    *
+   **********************/
+  else if ($user->subst == 'sitdown') {
+    if ($argz[0] == 'wakeup') {
+      $bri->room_wakeup(&$user);      
+    }
+    else if ($argz[0] == 'logout') {
+      $bri->room_wakeup(&$user);      
+      $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
+      $user->comm[$user->step % COMM_N] .= sprintf('postact_logout();');
+      $user->the_end = TRUE;
+      $user->step++;
+    }
+  }
 }
-/***************
- *             *
- *    TABLE    *
- *             *
- ***************/
+/*********************
+ *                   *
+ *    STAT: table    *
+ *                   *
+ *********************/
 else if ($user->stat == 'table') {
   $user->laccwr = time();
   $table = &$bri->table[$user->table];
@@ -180,7 +280,7 @@ else if ($user->stat == 'table') {
     $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
     $user->comm[$user->step % COMM_N] .= show_table_info(&$bri, &$table, $user->table_pos);
     log_wr($sess, $user->comm[$user->step % COMM_N]);
-    $user->step_inc();
+    $user->step++;
   }
   else if ($argz[0] == 'chatt') {
     $bri->chatt_send(&$user,$mesg);
@@ -202,14 +302,13 @@ else if ($user->stat == 'table') {
        $user->comm[$user->step % COMM_N] .=  show_notify("<br>I dati presenti sul server non erano allineati con quelli inviati dal tuo browser, adesso lo sono. Riprova ora.", 2000, "Torna alla partita.", 400, 100);
        
        log_wr($sess, $user->comm[$user->step % COMM_N]);
-       $user->step_inc();
+       $user->step++;
        $logout_cont = FALSE;
       }
     }
-    else {
+    else 
       $user->bantime = $user->laccwr + BAN_TIME;
-      // BAN_IP_SET
-    }
+    
     if ($logout_cont == TRUE) {
       $bri->room_wakeup(&$user);
     }
@@ -227,7 +326,7 @@ else if ($user->stat == 'table') {
                     ($user_cur[$i]->exitislock ? 'true' : 'false'));
       $user_cur[$i]->comm[$user_cur[$i]->step % COMM_N] = $ret;
       log_wr($sess, $user_cur[$i]->comm[$user_cur[$i]->step % COMM_N]);
-      $user_cur[$i]->step_inc();
+      $user_cur[$i]->step++;
     }
   }
   else if ($user->subst == 'asta') {
@@ -248,7 +347,7 @@ else if ($user->stat == 'table') {
        $ret = sprintf('gst.st = %d;', $user_cur->step+1);
        $ret .= show_table(&$bri,&$user_cur,$user_cur->step+1, TRUE, TRUE);
        $user_cur->comm[$user_cur->step % COMM_N] = $ret;
-       $user_cur->step_inc();      
+       $user_cur->step++;          
       }
     }
     else if ($argz[0] == 'asta') {
@@ -338,7 +437,7 @@ else if ($user->stat == 'table') {
                $ret .= sprintf('dispose_asta(%d,%d, %s); remark_off();',
                                $table->asta_card + 1, -($table->asta_pnt+1), ($user_cur->handpt <= 2 ? "true" : "false"));
              $user_cur->comm[$user_cur->step % COMM_N] = $ret;
-             $user_cur->step_inc();
+             $user_cur->step++;
            }
          }
          else if ($table->asta_pla_n == 0) {
@@ -358,7 +457,7 @@ else if ($user->stat == 'table') {
              $ret = sprintf('gst.st = %d;', $user_cur->step+1);
              $ret .= show_table(&$bri,&$user_cur,$user_cur->step+1, TRUE, TRUE);
              $user_cur->comm[$user_cur->step % COMM_N] = $ret;
-             $user_cur->step_inc();        
+             $user_cur->step++;            
            }
          }
          else {
@@ -373,7 +472,7 @@ else if ($user->stat == 'table') {
            else {
              //"gst.st = ".($user->step+1)."; dispose_asta(".($table->asta_card + 1).",".-($table->asta_pnt).", true); remark_off();";
              $user->comm[$user->step % COMM_N] = sprintf( "gst.st = %d; dispose_asta(%d, %d, false); remark_off();", $user->step+1, $table->asta_card + 1,-($table->asta_pnt));
-             $user->step_inc();
+             $user->step++;
              for ($i = 1 ; $i < PLAYERS_N ; $i++) {
                $chooser = ($table->gstart + $i) % PLAYERS_N;
                if ($table->asta_pla[$chooser]) {
@@ -395,7 +494,7 @@ else if ($user->stat == 'table') {
              }
 
              $user_cur->comm[$user_cur->step % COMM_N] = $ret;
-             $user_cur->step_inc();        
+             $user_cur->step++;            
            }
          }
        }
@@ -434,7 +533,7 @@ else if ($user->stat == 'table') {
              $ret .= "is_my_time = false; remark_off();";
 
            $user_cur->comm[$user_cur->step % COMM_N] = $ret;
-           $user_cur->step_inc();          
+           $user_cur->step++;      
          }
          /*
             TUTTE LE VARIABILI DI STATO PER PASSARE A GIOCARE E LE
@@ -553,7 +652,7 @@ else if ($user->stat == 'table') {
          $user_cur = &$bri->user[$table->player[$i]];
        
          $user_cur->comm[$user_cur->step % COMM_N] = $retar[$i];
-         $user_cur->step_inc();            
+         $user_cur->step++;        
        }
 
        log_wr($sess, sprintf("TURN: %d",$table->turn));