X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2FObj%2Fbriskin5.phh;h=0bbd9d9afedc3f647d257c2c928adbf5aadacb04;hb=94b406ae5451c04176ae43cad2e71f9f80d40d82;hp=4e5b40666427fca0fdd367d65861c6140a3ab6a1;hpb=a222ac87c9aa8297cc7dd4ede7c9b92089d52238;p=brisk.git
diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index 4e5b406..0bbd9d9 100644
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -32,6 +32,7 @@ define('BIN5_PROXY_PATH', PROXY_PATH."/bin5");
require_once('rules.phh');
+// FOR TORNEO TURN IT TO BIN5_TOURNAMENT_TOGETHER17
define('BIN5_TOURNAMENT_CURRENT', BIN5_TOURNAMENT_NO_DRAW);
$mlang_bin5_bin5 = array(
@@ -40,51 +41,8 @@ $mlang_bin5_bin5 = array(
'en' => '%3$slast hand%4$s'),
'info_curr' => array( 'it' => '%3$smano corrente%4$s',
'en' => '%3$scurrent hand%4$s'),
- // br, hr, b, /b, win, fri
- 'info_part' => array( 'it' => 'Ha chiamato %3$s%5$s%4$s (punti torneo %7$d), il socio era %3$s%6$s%4$s,%1$s',
- 'en' => 'The declarer was %3$s%5$s%4$s (tournment points %7$d), the partner was %3$s%6$s%4$s,%1$s'),
- // br, hr, b, /b
- 'info_capp' => array( 'it' => 'hanno fatto %3$scappotto%4$s EBBRAVI!.%1$s',
- 'en' => 'and they made %3Dscapot%4$s WELL DONE!.%1$s'),
-
- // br, hr, b, /b, old_asta_pnt, old_pnt, winornot
- 'info_alea' => array( 'it' => 'dovevano fare %3$salmeno %5$d%4$s punti e ne hanno fatti %3$s%6$d%4$s: hanno %7$s.%1$s',
- 'en' => 'they had to do %3$sat least %5$d%4$s points and they had made %3$s%6$d%4$s: they have %7$s.%1$s'),
- // br, hr, b, /b, old_pnt, winornot
- 'info_more' => array( 'it' => 'dovevano fare %3$spiù di 60%4$s punti e ne hanno fatti %3$s%5$d%4$s: hanno %6$s.%1$s',
- 'en' => 'they had to do %3$sover 60%4$s points and they had made %3$s%5$d%4$s: they have %3$s%6$s%4$s.%1$s'),
- 'info_win' => array( 'it' => 'vinto',
- 'en' => 'win'),
- 'info_peer' => array( 'it' => 'pareggiato',
- 'en' => 'drew'),
- 'info_lost' => array( 'it' => 'perso',
- 'en' => 'lost'),
-
- // br, hr, b, /b, win_name
- 'info_alon' => array( 'it' => '%3$s%5$s%4$s si è chiamato in mano (punti torneo %6$d),%1$s',
- 'en' => '%3$s%5$s%4$s play alone against each other (tournment points %6$d),%1$s'),
- // br, hr, b, /b, old_asta_pnt, old_pnt, winornot
- 'info_aleaa' => array( 'it' => 'doveva fare %3$salmeno %5$d%4$s punti e ne ha fatti %3$s%6$d%4$s: ha %3$s%7$s%4$s.%1$s',
- 'en' => 'he/she had to do %3$sat least %5$d%4$s points and they had made %3$s%6$d%4$s: he/she had %3$s%7$s%4$s.%1$s'),
- // br, hr, b, /b, old_pnt, winornot
- 'info_morea' => array( 'it' => 'doveva fare %3$spiù di 60%4$s punti e ne ha fatti %3$s%5$d%4$s: ha %3$s%6$s%4$s.%1$s',
- 'en' => 'he/she had to do %3$smore than 60%4$s points and they had made %3$s%5$d%4$s: he/she had %3$s%6$s%4$s.%1$s'),
- // br, hr, b, /b
- 'info_acap' => array( 'it' => 'ha fatto %3$scappotto%4$s EBBRAVO!.%1$s',
- 'en' => 'and he/she made %3$scapot%4$s WELL DONE!.%1$s'),
-
- // br, hr, b, /b
- 'info_omul' => array( 'it' => '%1$sLa partita valeva %3$s%5$s%4$s.%1$s',
- 'en' => '%1$sEN: The game was worth %3$s%5$s%4$s.%1$s' ),
-
- // br, hr, b, /b
- 'info_alpa' => array( 'it' => '%1$sHanno passato %3$stutti%4$s.%1$s',
- 'en' => '%1$sEN: Hanno passato %3$stutti%4$s.%1$s' ),
-
- // br, hr, b, /b, aband-name
- 'info_aban' => array( 'it' => ' Ha lasciato %3$s%5$s%4$s perché aveva al massimo %3$s2 punti%4$s.',
- 'en' => ' EN: Ha lasciato %3$s%5$s%4$s perché aveva al massimo %3$s2 punti%4$s.'),
-
+ 'info_yshuf'=> array( 'it' => 'Fai tu il mazzo, ',
+ 'en' => 'It\'s your shuffled the cards, '),
'info_shuf' => array( 'it' => 'Il mazzo a %s, ',
'en' => '%s shuffled the cards, '),
'info_yturn'=> array( 'it' => ' tocca a te giocare.',
@@ -93,10 +51,9 @@ $mlang_bin5_bin5 = array(
'en' => 'it\'s the %s\'s turn.'),
'info_mult' => array( 'it' => ' La partita vale %s.',
'en' => ' The game worth %s.' ),
- 'info_yshuf'=> array( 'it' => 'Fai tu il mazzo, ',
- 'en' => 'It\'s your shuffled the cards, '),
'info_match'=> array( 'it' => 'Il codice della partita è %d.',
'en' => 'Match code is %d.'),
+
'btn_bkgame'=> array( 'it' => 'torna alla partita',
'en' => 'back to the game'),
'call_wptn' => array( 'it' => '
con %d punti',
@@ -111,14 +68,21 @@ $mlang_bin5_bin5 = array(
$table_wellarr = Array( 'it' => Array ( 'Benvenuto al tavolo. Se almeno tre giocatori non sbloccano l\'uscita cliccando il lucchetto, chi esce non può risedersi a un qualunque tavolo per '.floor(BAN_TIME/60).' minuti.'),
'en' => Array ( 'EN Benvenuto al tavolo. Se almeno tre giocatori non sbloccano l\'uscita cliccando il lucchetto, chi esce non può risedersi a un qualunque tavolo per '.floor(BAN_TIME/60).' minuti.') );
-function rules_id2name($id)
+
+// FIXME - DYNAMIC WITH CACHE AND RELOAD FROM DB
+function deck_keys()
+{
+ return array('xx', 'yy');
+}
+
+function deck_id2descr($id, $lang)
{
- if ($id == 1)
- return 'Rules_old_rules';
- else if ($id == 2)
- return 'Rules_no_draw';
+ if ($id == 'xx')
+ return 'carte originali';
+ else if ($id == 'yy')
+ return 'carte strette';
- return 'Rules_unknown';
+ return 'carte sconosciute';
}
function multoval($mult)
@@ -135,6 +99,33 @@ function multoval($mult)
return (sprintf(($G_lang == 'en' ? "%d-ple" : "%d-plo"), $mult));
}
+function dom_select_rules()
+{
+ GLOBAL $G_lang;
+
+ $ret = "\n";
+
+ echo "$ret";
+}
+
+function dom_select_deck($cur_sel)
+{
+ GLOBAL $G_lang;
+
+ $ret = "\n";
+
+ echo "$ret";
+}
class Card {
var $value; /* 0 - 39 card value */
@@ -177,19 +168,19 @@ class Card {
} // end class Card
class Bin5_table extends Table {
- var $card; // il mazzo di carte
- var $mazzo; // chi e' di mazzo
- var $gstart;
- var $turn;
+ var $card; // il mazzo di carte
+ var $mazzo; // chi e' di mazzo
+ var $gstart; // first player of the current game
+ var $turn; // turn in the game (absolute, not modularized)
- var $asta_pla;
- var $asta_pla_n;
- var $asta_card;
- var $asta_pnt;
+ var $asta_pla; // array(); TRUE: in auction, FALSE: out of the auction
+ var $asta_pla_n; // number of players in auction
+ var $asta_card; // current card for auction
+ var $asta_pnt; // current point for auction
var $mult;
- var $points; // points array
- var $points_n; // number of row of points
+ var $points; // points array
+ var $points_n; // number of row of points
var $total;
var $asta_win; // the caller idx position at table
@@ -305,6 +296,7 @@ class Bin5_table extends Table {
function spawn(&$from)
{
+ GLOBAL $G_lang;
if (($thiz =& new Bin5_table()) == FALSE)
return (FALSE);
@@ -429,6 +421,7 @@ class Bin5_table extends Table {
$user_cur->asta_card = -2;
$user_cur->asta_pnt = -1;
$user_cur->handpt = $this->hand_points($i);
+ $this->rules->tourn_points($user_cur, $i);
}
log_rd2("GEND 4");
}
@@ -500,6 +493,11 @@ class Bin5_table extends Table {
$curtime = time();
do {
+ if ($this->match_id != -1) {
+ $msg = sprintf("Stai già giocando la partita con codice %d.", $this->match_id);
+ break;
+ }
+
/* - verify if match_id and user are both valid to accept
the match_continue request - */
$match_id = (int)$match_id_s;
@@ -508,11 +506,6 @@ class Bin5_table extends Table {
break;
}
- if ($user->continue_get() == BIN5_USER_CONTINUE_ALREADY) {
- $msg = "Hai già richiesto di continuare una partita.";
- break;
- }
-
if ($user->continue_get() == $match_id) {
$msg = "Hai già richiesto di continuare questa partita.";
break;
@@ -538,18 +531,34 @@ class Bin5_table extends Table {
/* - the user is in the list, add the match_id to his profile
and check if he is the N'th to require continue - */
- // set the match_id for the current user
- $user->continue_set($match_id);
-
+ $continue_tot = 0;
for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
$user_cur = &$bri->user[$this->player[$i]];
- if ($user_cur->continue_get() != $match_id) {
- break;
+
+ if ($user == $user_cur) {
+ $continue_tot += 1;
+ continue;
}
+
+ if ($user_cur->continue_get() == BIN5_USER_CONTINUE_INIT)
+ continue;
+
+ if ($user_cur->continue_get() != $match_id)
+ break;
+ $continue_tot += 1;
+ }
+ if ($i < BIN5_PLAYERS_N) {
+ $msg = sprintf("L'utente %s voleva già continuare la partita n° %d.",
+ xcape($user_cur->name), $user_cur->continue_get());
+ break;
}
+
+ // set the match_id for the current user
+ $user->continue_set($match_id);
+
$ret = TRUE;
// not all players set the continue match than we exit
- if ($i < BIN5_PLAYERS_N) {
+ if ($continue_tot < BIN5_PLAYERS_N) {
$msg = sprintf("L'utente %s vorrebbe continuare la partita n° %d.",
xcape($user->name), $match_id);
break;
@@ -595,12 +604,11 @@ class Bin5_table extends Table {
$this->mazzo = $match_data['mazzo_next'];
$this->mult = $match_data['mult_next'];
$this->match_id = $match_id;
- $this->game_init(&$bri->user);
+ $this->game_init($bri->user);
/* reload of the page with the new layout */
for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
$user_cur = &$bri->user[$this->player[$i]];
- $user_cur->continue_set(BIN5_USER_CONTINUE_ALREADY);
$user_cur->trans_step = $user_cur->step + 1;
$user_cur->comm[$user_cur->step % COMM_N] = sprintf('gst.st_loc++; gst.st=%d; xstm.stop(); window.onunload = null ; window.onbeforeunload = null ; document.location.assign("index.php");|', $user_cur->step+1);
@@ -611,7 +619,7 @@ class Bin5_table extends Table {
$user_cur->comm[$user_cur->step % COMM_N] = "";
$user_cur->step_inc();
- $user_cur->comm[$user_cur->step % COMM_N] = show_table(&$bri, &$user_cur, $user_cur->step+1, TRUE, FALSE);
+ $user_cur->comm[$user_cur->step % COMM_N] = show_table($bri, $user_cur, $user_cur->step+1, TRUE, FALSE);
$user_cur->step_inc();
}
return (TRUE);
@@ -628,6 +636,127 @@ class Bin5_table extends Table {
}
}
+ function rules_change(&$bri, $user, $rules_id_s)
+ {
+ GLOBAL $G_lang;
+
+ //
+ // Rules: update version following loaded tcode
+ //
+ $ret = FALSE;
+ $curtime = time();
+
+ do {
+ if ($this->match_id != -1) {
+ // FIXME_LANG
+ $msg = sprintf("Stai già giocando la partita con codice %d.", $this->match_id);
+ break;
+ }
+
+ if ($this->asta_card != -1 || $this->asta_pla_n < BIN5_PLAYERS_N) {
+ // FIXME_LANG
+ $msg = sprintf("La partita è già stata avviata.");
+ break;
+ }
+
+ $rules_id = (int)$rules_id_s;
+ if (! in_array($rules_id, rules_keys())) {
+ // FIXME_LANG
+ $msg = "queste regole non esistono o non sono attive";
+ break;
+ }
+
+ if ($user->rules_get() == $rules_id) {
+ // FIXME_LANG
+ $msg = "hai già richiesto di usare queste regole";
+ break;
+ }
+
+ /* - the user is in the list, add the match_id to his profile
+ and check if he is the N'th to require continue - */
+
+ $rules_tot = 0;
+ for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
+ $user_cur = &$bri->user[$this->player[$i]];
+
+ if ($user == $user_cur) {
+ $rules_tot += 1;
+ continue;
+ }
+
+ if ($user_cur->rules_get() == BIN5_USER_CONTINUE_INIT)
+ continue;
+
+ if ($user_cur->rules_get() != $rules_id)
+ break;
+ $rules_tot += 1;
+ }
+ if ($i < BIN5_PLAYERS_N) {
+ // FIXME_LANG
+ $msg = sprintf("L'utente %s voleva già usare le %s.",
+ xcape($user_cur->name), xcape(rules_id2descr($user_cur->rules_get(), $G_lang)));
+ break;
+ }
+
+ // set the match_id for the current user
+ $user->rules_set($rules_id);
+
+ $ret = TRUE;
+ // not all players set the continue match than we exit
+ if ($rules_tot < BIN5_PLAYERS_N) {
+ // FIXME_LANG
+ $msg = sprintf("L'utente %s vorrebbe usare le %s.",
+ xcape($user->name), xcape(rules_id2descr($rules_id, $G_lang)));
+ break;
+ }
+
+ /* - all users decide to continue the same match, update all infos and rearrange users
+ to the right positions on the table - */
+
+ /* update rules engine */
+ $rules_name = rules_id2name($rules_id);
+ $this->rules = new $rules_name($this);
+
+ // $this->game_init($bri->user);
+
+ /* reload of the page with the new layout */
+ for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
+ $user_cur = &$bri->user[$this->player[$i]];
+ $this->rules->tourn_points($user_cur, $i);
+
+ $user_cur->rules_set(BIN5_USER_CONTINUE_INIT);
+ $user_cur->trans_step = $user_cur->step + 1;
+ $user_cur->comm[$user_cur->step % COMM_N] = sprintf('gst.st_loc++; gst.st=%d; xstm.stop(); window.onunload = null ; window.onbeforeunload = null ; document.location.assign("index.php");|', $user_cur->step+1);
+ $user_cur->step_inc();
+
+ // a void command force xynt-streamer to flush all data to client
+ $user_cur->trans_step = $user_cur->step + 1;
+ $user_cur->comm[$user_cur->step % COMM_N] = "";
+ $user_cur->step_inc();
+
+ $user_cur->comm[$user_cur->step % COMM_N] = show_table($bri, $user_cur, $user_cur->step+1, TRUE, FALSE);
+ $user_cur->step_inc();
+ }
+ return (TRUE);
+ } while (FALSE);
+
+ $dt = date("H:i ", $curtime);
+ if ($ret == TRUE) {
+ for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
+ $user_cur = &$bri->user[$this->player[$i]];
+ $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
+ $user_cur->comm[$user_cur->step % COMM_N] .= nickserv_msg($dt, $msg);
+ $user_cur->step_inc();
+ }
+ }
+ else {
+ $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
+ $user->comm[$user->step % COMM_N] = xcape(sprintf("rules_set(%d);",
+ $this->rules->id));
+ $user->comm[$user->step % COMM_N] .= nickserv_msg($dt, $msg);
+ $user->step_inc();
+ }
+ } // end function rules_change
} // end class Bin5_table
@@ -635,7 +764,8 @@ class Bin5_table extends Table {
define('BIN5_USER_FLAG_RING_ENDAUCT', 0x01);
define('BIN5_USER_CONTINUE_INIT', -1);
-define('BIN5_USER_CONTINUE_ALREADY', -2);
+
+define('BIN5_USER_RULES_INIT', -1);
class Bin5_user extends User {
var $asta_card; //
var $asta_pnt; //
@@ -644,6 +774,9 @@ class Bin5_user extends User {
var $privflags; // Flags for briskin5 only
var $continue; // Id of the match that the user would continue
+ var $rules; // Id of rules required by user
+
+ var $asta_tourn_pts; // array with tournment points for each suit
const BASE = "../";
@@ -661,6 +794,7 @@ class Bin5_user extends User {
$thiz->exitislock = TRUE;
$thiz->privflags = 0;
$thiz->continue = BIN5_USER_CONTINUE_INIT;
+ $thiz->rules = BIN5_USER_RULES_INIT;
return ($thiz);
}
@@ -681,6 +815,7 @@ class Bin5_user extends User {
$this->exitislock = $from->exitislock;
$this->privflags = $from->privflags;
$this->continue = $from->continue;
+ $this->rules = $from->rules;
}
/* CLONE NOT USED
@@ -716,6 +851,7 @@ class Bin5_user extends User {
$thiz->handpt = -1;
$thiz->exitislock = TRUE;
$thiz->continue = BIN5_USER_CONTINUE_INIT;
+ $thiz->rules = BIN5_USER_RULES_INIT;
log_wr("Bin5 constructor");
@@ -843,7 +979,7 @@ class Bin5_user extends User {
protected function page_sync($sess, $page)
{
log_rd2("PAGE_SYNC");
- printf("xXx BIN5_USER::PAGE_SYNC\n");
+ // printf("xXx BIN5_USER::PAGE_SYNC\n");
return (sprintf('xstm.stop(); window.onbeforeunload = null; window.onunload = null; document.location.assign("%s");', $page));
}
@@ -900,8 +1036,8 @@ class Bin5_user extends User {
if ($this->stat == 'table') {
log_load("RESYNC");
/* NOTE: $this->room is associated with the current $bri object */
- printf("xXx CLASS NAME [%s]\n", get_class($this->room));
- $ret = show_table(&$this->room, $this, $this->step, FALSE, FALSE);
+ // printf("xXx CLASS NAME [%s]\n", get_class($this->room));
+ $ret = show_table($this->room, $this, $this->step, FALSE, FALSE);
}
log_rd2("NEWSTAT: ".$this->stat);
@@ -918,11 +1054,11 @@ class Bin5_user extends User {
if ($this->rd_stat != $this->stat) {
$to_stat = $this->stat;
log_load("RESYNC");
- printf("xXx BIN5_USER::MAINCHECK\n");
+ // printf("xXx BIN5_USER::MAINCHECK\n");
return ($this->page_sync($this->sess, ($to_stat == "table" ? "index.php" : "../index.php"), $this->table, $this->table_token));
}
log_rd2("lost history, refresh from scratch");
- printf("xXx LOST HISTORY!\n");
+ // printf("xXx LOST HISTORY!\n");
$this->rd_step = -1;
break;
}
@@ -962,6 +1098,15 @@ class Bin5_user extends User {
return ($this->continue);
}
+ function rules_set($rules_id)
+ {
+ $this->rules = $rules_id;
+ }
+
+ function rules_get() {
+ return ($this->rules);
+ }
+
} // end class Bin5_user
@@ -1004,7 +1149,7 @@ class Bin5 {
$user[$table->player[$i]]->table_token = $table_token;
$this->user[$i] = Bin5_user::spawn($user[$table->player[$i]], $this, $table_idx, $i, $get, $post, $cookie);
}
- $this->table[0] = Bin5_table::spawn(&$table);
+ $this->table[0] = Bin5_table::spawn($table);
log_main("TABLE_OLD_WIN - Bin5:".$this->table[0]->old_asta_win);
@@ -1087,7 +1232,7 @@ class Bin5 {
($user_cur->stat == 'table' && ($user_cur->subst == 'shutdowned' || $user_cur->subst == 'shutdowner')))
continue;
- if ($user_cur->lacc + EXPIRE_TIME_RD < ($curtime - $delta)) { // Auto logout dell'utente
+ if ($user_cur->lacc + (($user_cur->ping_req ? 1.5 : 1.0) * EXPIRE_TIME_RD) < ($curtime - $delta)) { // Auto logout dell'utente
log_rd2($user_cur->sess." bin5 AUTO LOGOUT.");
if ($user_cur->stat == 'table') {
@@ -1097,7 +1242,7 @@ class Bin5 {
$user_cur->the_end = TRUE;
/* se gli altri utenti non erano d'accordo questo utente viene bannato */
- $remcalc = $this->table[0]->exitlock_calc(&$this->user, $user_cur->table_pos);
+ $remcalc = $this->table[0]->exitlock_calc($this->user, $user_cur->table_pos);
if ($remcalc < 3) {
require_once("${G_base}Obj/hardban.phh");
Hardbans::add(($user_cur->is_auth() ? $user_cur->name : FALSE),
@@ -1207,6 +1352,12 @@ class Bin5 {
$match_id = substr($user_mesg, 6);
$table->match_continue($this, $user, $match_id);
}
+ else if (strncmp($user_mesg, "/rules ", 7) == 0) {
+ log_main($user->sess." chatt_send BEGIN");
+
+ $rules_id = substr($user_mesg, 7);
+ $table->rules_change($this, $user, $rules_id);
+ }
else {
for ($i = 0 ; $i < ($user->stat == 'room' ? BIN5_MAX_PLAYERS : BIN5_PLAYERS_N) ; $i++) {
if ($user->stat == 'room') {
@@ -1284,7 +1435,7 @@ class Bin5 {
{
GLOBAL $G_ban_list, $G_black_list;
- printf("NEW_SOCKET (root): %d\n", intval($new_socket));
+ // printf("NEW_SOCKET (root): %d\n", intval($new_socket));
$enc = get_encoding($header);
if (isset($header['User-Agent'])) {
@@ -1311,7 +1462,7 @@ class Bin5 {
case "":
case "index.php":
ob_start();
- bin5_index_main($transp_type, $header_out, $addr, $get, $post, $cookie);
+ bin5_index_main($transp_type, $header, $header_out, $addr, $get, $post, $cookie);
$content = ob_get_contents();
ob_end_clean();
@@ -1339,9 +1490,10 @@ class Bin5 {
break;
case "index_rd.php":
+ case "index_rd_wss.php":
if (($transp = gpcs_var('transp', $get, $post, $cookie)) === FALSE)
$transp = "iframe";
- if ($transp == 'websocket')
+ if ($transp == 'websocket' || $transp == 'websocketsec')
$enc = 'plain';
do {
@@ -1363,7 +1515,7 @@ class Bin5 {
if (($prev = $user->rd_socket_get()) != NULL) {
$s_a_p->socks_unset($user->rd_socket_get());
fclose($user->rd_socket_get());
- printf("CLOSE AND OPEN AGAIN ON IFRA2\n");
+ // printf("CLOSE AND OPEN AGAIN ON IFRA2\n");
$user->rd_socket_set(NULL);
}
@@ -1386,7 +1538,7 @@ class Bin5 {
$s_a_p->socks_set($new_socket, $user, NULL);
$user->rd_socket_set($new_socket);
- printf(" - qui ci siamo - ");
+ // printf(" - qui ci siamo - ");
return TRUE;
} while (FALSE);
@@ -1441,11 +1593,13 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
$table_pos = $user->table_pos;
$ret = "table_init();";
- $ret .= $table->exitlock_show(&$bri->user, $table_pos);
+ $ret .= $table->exitlock_show($bri->user, $table_pos);
if (!$is_again) {
/* GENERAL STATUS */
- $ret .= sprintf( 'gst.st = %d; stat = "%s"; subst = "%s"; table_pos = %d;',
- $sendstep, $user->stat, $user->subst, $table_pos);
+ $user_rules = $user->rules_get();
+ $ret .= sprintf('gst.st = %d; stat = "%s"; subst = "%s"; table_pos = %d; rules_set(%d);',
+ $sendstep, $user->stat, $user->subst, $table_pos,
+ ($user_rules == BIN5_USER_CONTINUE_INIT ? $table->rules->id_get() : $user_rules));
log_rd(sprintf( 'SHOW_TABLE: gst.st = %d; stat = "%s"; subst = "%s"; table_pos = %d;', $sendstep, $user->stat, $user->subst, $table_pos));
@@ -1472,7 +1626,7 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
}
/* NOTIFY FOR THE CARD MAKER */
if ($is_transition) { // && $user->subst == "asta" superfluo
- $ret .= show_table_info(&$bri, &$table, $table_pos);
+ $ret .= show_table_info($bri, $table, $table_pos);
$ret .= "setTimeout(preload_images, 500, g_preload_img_arr, g_imgct);";
}
else {
@@ -1481,8 +1635,8 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
if (!$is_again)
$ret .= table_welcome($user);
- if ($is_transition && !$is_again) { // appena seduti al tavolo, play della mucca
- $ret .= playsound("cow.mp3");
+ if ($is_transition && !$is_again) { // just sit, play cow
+ $ret .= playsound("cow");
}
@@ -1581,6 +1735,7 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
$table->asta_card);
}
else {
+ // FIXME - RULES to be able to abandon table
/* show auction */
if ($table_pos == ($table->gstart % BIN5_PLAYERS_N) &&
$table->asta_win == -1)
@@ -1679,7 +1834,8 @@ function show_table_info(&$bri, &$table, $table_pos)
// TAG: POINTS_MANAGEMENT
$pnt_min = $table->points_n - MAX_POINTS < 0 ? 0 : $table->points_n - MAX_POINTS;
- $noty = sprintf(' | ');
+ $noty = sprintf('%s.
\n', xcape(ucfirst(rules_id2descr($table->rules->id_get(), $G_lang))));
+ $noty .= sprintf(' | ');
// Names.
for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++)
|---|
|---|