X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2FObj%2Fbriskin5.phh;h=f18b0fa005422da0a964a4c7e654e3a36b549364;hb=be047939b855f179f5028f01fed371c4ac4fb235;hp=beaeed6395990284992f79c560b9ca9f9ffc95d2;hpb=dcff4d0735d2c55fe7ae7b1abc6854df39465de3;p=brisk.git

diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index beaeed6..f18b0fa 100644
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -49,7 +49,7 @@ $mlang_bin5_bin5 = array(
                                                'en' => 'they have <b>lost</b>'),
                          'info_yturn'=> array( 'it' => ' tocca a <b>te</b> giocare.',
                                                'en' => ' it\'s <b>your</b> turn.'),
-                         'info_turn' => array( 'it' => 'tocca a <b>$unam</b> giocare.',
+                         'info_turn' => array( 'it' => 'tocca a <b>%s</b> giocare.',
                                                'en' => 'it\'s the <b>%s</b>\'s turn.'),
                          'info_mult' => array( 'it' => ' La partita vale <b>%s</b>.',
                                                'en' => ' The game worth <b>%s</b>.' ),
@@ -195,7 +195,7 @@ class Table_briskin5 extends Table {
   */
 
   /* CLONE() NOT USED
-  function &clone(&$from)
+  function &myclone(&$from)
   {
     GLOBAL $G_false;
     
@@ -446,7 +446,7 @@ class User_briskin5 extends User {
   }
 
   /* CLONE NOT USED
-  function &clone(&$from)
+  function &myclone(&$from)
   {
     GLOBAL $G_false;
     
@@ -951,11 +951,12 @@ function locshm_exists($tok)
     
 }
 
-
+// rendiamo qui l'elenco dei punti come return della func
 function calculate_points(&$table)
 {
   GLOBAL $G_all_points; 
 
+  $ret = array();
   $pro = 0;
 
   if ($table->asta_pnt == 60)
@@ -1010,10 +1011,13 @@ function calculate_points(&$table)
     
     $table->points[$table->points_n % MAX_POINTS][$i] = $pt;
     $table->total[$i] += $pt;
+    $ret[$i] = $pt;
   }
   $table->points_n++;
   $table->old_pnt = $pro;
   $table->mult = 1;
+  
+  return($ret);
 }
 
 /* show table 
@@ -1384,6 +1388,7 @@ function table_wellcome($user)
 
 function briscola_show($room, $table, $user)
 {
+  GLOBAL $G_lang, $mlang_bin5_bin5;
   $ptnadd = "";
   $ret = "";