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

diff --git a/web/index_wr.php b/web/index_wr.php
index 5a1eb88..7fbf6a3 100644
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -60,9 +60,19 @@ if ($argz[0] == 'shutdown') {
     log_rd2($sess, "SHUTDOWN FROM WHAT ???");
 }
 else if ($user->stat == 'room') {
+  $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("bottom", $G_room_help, 0, "torna ai tavoli");
+    $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++;
@@ -105,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!");
@@ -119,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);
@@ -148,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') {
@@ -230,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]) {
@@ -277,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)