X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_wr.php;h=7fbf6a383f16ede6d412556aaef7fb73895c2fd8;hb=b1ab2024d5e2e81099c704a6b78ef9d5476c5f62;hp=0f20a7b82451fd3b649c00858793005f326979ab;hpb=9c5779d8ac2bddb4da83ec1f2ae87b06ac007413;p=brisk.git

diff --git a/web/index_wr.php b/web/index_wr.php
index 0f20a7b..7fbf6a3 100644
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -36,7 +36,7 @@ log_wr($sess, 'COMM: '.$mesg);
 
 $sem = lock_data();
 $bri = &load_data();
-if (($user = &get_user($bri, $sess, &$idx)) == FALSE) {
+if (($user = &$bri->get_user($sess, &$idx)) == FALSE) {
   echo "Get User Error";
   log_wr($sess, "Get User Error");
   unlock_data($sem);
@@ -60,7 +60,25 @@ if ($argz[0] == 'shutdown') {
     log_rd2($sess, "SHUTDOWN FROM WHAT ???");
 }
 else if ($user->stat == 'room') {
-  if ($argz[0] == 'logout') {
+  $user->laccwr = time();
+
+  if ($argz[0] == 'help') {
+    $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
+    $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++;
+    
+  }
+  else if ($argz[0] == 'about') {
+    $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
+    $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++;
+    
+  }
+  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;
@@ -89,9 +107,7 @@ else if ($user->stat == 'room') {
     // set new status
     $user->subst = "sitdown";
     $user->table = $table_idx;
-    $user->table_pos = $table->player_n;
-    $table->player[$table->player_n] = $idx;
-    $table->player_n++;
+    $user->table_pos = $table->user_add($idx);
 		
     if ($table->player_n == PLAYERS_N) {
       // Start game for this table.
@@ -99,7 +115,8 @@ else if ($user->stat == 'room') {
       
       $table->init();
       $table->game_init(&$bri);
-      
+      $curtime = time();
+
       for ($i = 0 ; $i < $table->player_n ; $i++) {
 	$user_cur = &$bri->user[$table->player[$i]];
 	log_wr($sess, "Pre if!");
@@ -113,6 +130,7 @@ else if ($user->stat == 'room') {
 	
 	$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);
@@ -142,6 +160,7 @@ else if ($user->stat == 'room') {
  *             *
  ***************/
 else if ($user->stat == 'table' && $user->subst == 'asta') {
+  $user->laccwr = time();
   $table = &$bri->table[$user->table];
 
   if ($argz[0] == 'logout') {
@@ -154,10 +173,7 @@ else if ($user->stat == 'table' && $user->subst == 'asta') {
     log_wr($sess, "PER DI TABLEINFO");
     $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++;
   }
   else if ($argz[0] == 'chatt') {
@@ -227,8 +243,9 @@ else if ($user->stat == 'table' && $user->subst == 'asta') {
 	    $maxcard = $user_cur->asta_card;
 	}
 
-	if ($table->asta_pla_n > ($maxcard > -1 ? 1 : 0) &&
+	if (($table->asta_pla_n > ($maxcard > -1 ? 1 : 0)) &&
 	    !($table->asta_card == 9 && $table->asta_pnt == 120)) {
+	  log_wr($sess,"ALLOPPA QUI");
 	  for ($i = 1 ; $i < PLAYERS_N ; $i++) {
 	    $index_next = ($table->gstart + $i) % PLAYERS_N;
 	    if ($table->asta_pla[$index_next]) {
@@ -274,7 +291,7 @@ else if ($user->stat == 'table' && $user->subst == 'asta') {
 	else {
 	  log_wr($sess, "FINITA !");
 	  // if a_pnt == 120 supergame ! else abbandono
-	  if ($a_pnt == 120) {
+	  if ($a_pnt == 120 || $user->asta_card != -1) {
 	    $chooser = $index_cur;
 	    for ($i = 1 ; $i < PLAYERS_N ; $i++) 
 	      if ($i != $chooser)