X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=inline;f=web%2Fbrisk.phh;h=2fc046219a8ee1d22b4a6b8e3adbade78b8019f5;hb=c632ffe4efc44480dcb52954fc088a24a04a712d;hp=589eed9a87386d1a29e7e11121cc2eca79e36f74;hpb=235cf6aed8c2413759cf6b44800cf9585d4ee6ca;p=brisk.git
diff --git a/web/brisk.phh b/web/brisk.phh
index 589eed9..2fc0462 100644
--- a/web/brisk.phh
+++ b/web/brisk.phh
@@ -22,11 +22,12 @@
define(FTOK_PATH, "/var/lib/brisk");
define(LEGAL_PATH, "/tmp/legal_brisk");
define(PROXY_PATH, "/var/lib/brisk_proxy");
-define(TABLES_N, 8);
+define(TABLES_N, 12);
define(PLAYERS_N, 3);
define(MAX_POINTS, 5);
define(MAX_PLAYERS, (20 + (PLAYERS_N * TABLES_N)));
define(SHM_DIMS, (50000 * MAX_PLAYERS));
+// define(COMM_N, 6);
define(COMM_N, 12);
define(COMM_GEN_N, 50);
define(SESS_LEN, 13);
@@ -40,10 +41,12 @@ define(NICKSERV, "SERVER");
define(BRISK_DEBUG, FALSE);
// define(DEBUGGING, "local");
+$G_false = FALSE;
+
$G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "0.7.2";
+$G_brisk_version = "0.8.2";
-$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), NOVITA\': ottimizzazione della CPU e chiuso il bug di mancato cambio pagina.',
+$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), NOVITA\': nuovo layout che permette più tavoli, più tavoli.',
'Se vuoi iscriverti alla Mailing List, cliccala!' );
$table_wellarr = 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.');
@@ -163,27 +166,37 @@ class Table {
function Table()
{
- $this->player = array();
- $this->player_n = 0;
- $this->card = &$this->bunch_create();
- $this->asta_pla = array(); // TRUE: in auction, FALSE: out of the auction
- $this->asta_pla_n= -1;
- $this->asta_card = -1;
- $this->asta_pnt = -1;
- $this->mult = 1;
- $this->points = array( );
- $this->points_n = 0;
- $this->total = array( 0, 0, 0, 0, 0);
- $this->asta_win = -1;
- $this->briscola = -1;
- $this->friend = -1;
- $this->turn = 0;
- $this->old_reason = "";
- $this->old_asta_pnt = -1;
- $this->old_pnt = -1;
- $this->old_win = -1;
- $this->old_friend= -1;
-
+ }
+
+ function &create()
+ {
+ GLOBAL $G_false;
+
+ if (($thiz = new Table()) == FALSE)
+ return ($G_false);
+
+ $thiz->player = array();
+ $thiz->player_n = 0;
+ $thiz->card = &$thiz->bunch_create();
+ $thiz->asta_pla = array(); // TRUE: in auction, FALSE: out of the auction
+ $thiz->asta_pla_n= -1;
+ $thiz->asta_card = -1;
+ $thiz->asta_pnt = -1;
+ $thiz->mult = 1;
+ $thiz->points = array( );
+ $thiz->points_n = 0;
+ $thiz->total = array( 0, 0, 0, 0, 0);
+ $thiz->asta_win = -1;
+ $thiz->briscola = -1;
+ $thiz->friend = -1;
+ $thiz->turn = 0;
+ $thiz->old_reason = "";
+ $thiz->old_asta_pnt = -1;
+ $thiz->old_pnt = -1;
+ $thiz->old_win = -1;
+ $thiz->old_friend= -1;
+
+ return ($thiz);
}
function &bunch_create()
@@ -209,7 +222,7 @@ class Table {
for ($i = 39 ; $i >= 0 ; $i--) {
$rn = rand(0, $i);
-
+
if ($rn == 0)
log_main("RND ZERO", "");
@@ -219,7 +232,7 @@ class Table {
$this->card[$id]->assign('hand', $owner);
$rest[$rn] = $rest[$i];
- $pubbpos[$rn2] = $pubbpos[$i];
+ // $pubbpos[$rn2] = $pubbpos[$i];
}
}
@@ -241,7 +254,7 @@ class Table {
function game_init(&$userarr)
{
- log_rd2($sess,"GSTART 4");
+ log_rd2("XXX", "GSTART 4");
$this->gstart = ($this->mazzo+1) % PLAYERS_N;
$this->bunch_make();
@@ -289,17 +302,17 @@ class Table {
return ($this->player_n - 1);
}
- function user_rem(&$bri, &$user)
+ function user_rem(&$room, &$user)
{
$tabpos = $user->table_pos;
/* verifico la consistenza dei dati */
- if ($bri->user[$this->player[$tabpos]] == $user) {
+ if ($room->user[$this->player[$tabpos]] == $user) {
/* aggiorna l'array dei giocatori al tavolo. */
for ($i = $tabpos ; $i < $this->player_n-1 ; $i++) {
$this->player[$i] = $this->player[$i+1];
- $user_cur = &$bri->user[$this->player[$i]];
+ $user_cur = &$room->user[$this->player[$i]];
$user_cur->table_pos = $i;
}
$this->player_n--;
@@ -366,25 +379,36 @@ class User {
var $exitislock; // Player can exit from the table ?
var $table; // id of the current table (if in table state)
var $table_pos; // idx on the table
-
- function User($name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") {
- $this->name = $name;
- $this->sess = $sess;
- $this->ip = $ip;
- $this->lacc = time();
- $this->laccwr = time();
- $this->bantime = 0;
- $this->stat = $stat;
- $this->subst = $subst;
- $this->step = 1;
- $this->trans_step = -1;
- $this->comm = array();
- $this->asta_card = -2;
- $this->asta_pnt = -1;
- $this->handpt = -1;
- $this->exitislock = TRUE;
+ var $the_end; // Flag to change the end of the session
+
+ function User() {
+ }
+
+ function &create($name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") {
+ GLOBAL $G_false;
+
+ if (($thiz = new User()) == FALSE)
+ return ($G_false);
+
+ $thiz->name = $name;
+ $thiz->sess = $sess;
+ $thiz->ip = $ip;
+ $thiz->lacc = time();
+ $thiz->laccwr = time();
+ $thiz->bantime = 0;
+ $thiz->stat = $stat;
+ $thiz->subst = $subst;
+ $thiz->step = 1;
+ $thiz->trans_step = -1;
+ $thiz->comm = array();
+ $thiz->asta_card = -2;
+ $thiz->asta_pnt = -1;
+ $thiz->handpt = -1;
+ $thiz->exitislock = TRUE;
+
+ $thiz->table = $table;
- $this->table = $table;
+ return ($thiz);
}
function stat_set($stat) {
@@ -409,7 +433,11 @@ class User {
break;
fwrite($fp, pack("l",$this->step), 4);
fclose($fp);
+
+ return (TRUE);
} while (0);
+
+ return (FALSE);
}
function step_inc() {
@@ -419,7 +447,11 @@ class User {
$fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w');
fwrite($fp, pack("l",$this->step), 4);
fclose($fp);
+
+ return (TRUE);
}
+
+ return (FALSE);
}
}
@@ -459,21 +491,22 @@ function step_unproxy($sess) {
}
-class brisco {
+class Room {
var $user;
var $table;
var $comm; // commands for many people
var $step; // current step of the comm array
var $garbage_timeout;
- function brisco () {
+ function Room () {
$this->user = array();
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- $this->user[$i] =& new User("", "");
+ $this->user[$i] =& User::create("", "");
}
+
for ($i = 0 ; $i < TABLES_N ; $i++)
- $this->table[$i] =& new Table();
+ $this->table[$i] =& Table::create();
$this->garbage_timeout = 0;
}
@@ -587,7 +620,7 @@ class brisco {
$ret .= table_content($this, $user_cur, $table_idx);
$ret .= standup_content($this, $user_cur);
- $act_content = table_act_content(FALSE, 0, $e, $user->table);
+ $act_content = table_act_content(FALSE, 0, $table_idx, $user->table);
$ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content);
@@ -752,7 +785,7 @@ class brisco {
$table = &$this->table[$user->table];
$user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
- $user_cur->comm[$user_cur->step % COMM_N] = sprintf('set_names(" %s", " %s", " %s", " %s", " %s"); ',
+ $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('set_names(" %s", " %s", " %s", " %s", " %s"); ',
xcape($this->user[$table->player[($user_cur->table_pos)%PLAYERS_N]]->name),
xcape($this->user[$table->player[($user_cur->table_pos+1)%PLAYERS_N]]->name),
xcape($this->user[$table->player[($user_cur->table_pos+2)%PLAYERS_N]]->name),
@@ -789,7 +822,7 @@ class brisco {
function &get_user($sess, &$idx)
{
- GLOBAL $PHP_SELF;
+ GLOBAL $PHP_SELF, $G_false;
if (validate_sess($sess)) {
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
@@ -807,11 +840,12 @@ class brisco {
else {
log_main($sess, sprintf("get_user: Wrong strlen [%s]",$sess));
}
- return (FALSE);
+
+ return ($G_false);
}
/*
- * function &add_user(&$bri, &$sess, &$idx, $name, $ip)
+ * function &add_user(&$room, &$sess, &$idx, $name, $ip)
*
* RETURN VALUE:
* if ($idx != -1 && ret == FALSE) => duplicated nick
@@ -821,12 +855,14 @@ class brisco {
*/
function &add_user(&$sess, &$idx, $name, $ip)
{
+ GLOBAL $G_false;
+
$idx = -1;
$idfree = -1;
if (($name_new = validate_name($name)) == FALSE) {
$idx = -2;
- return (FALSE);
+ return ($G_false);
}
log_auth("XXX", sprintf("ARRIVA: [%s]", $sess));
@@ -865,6 +901,7 @@ class brisco {
}
$this->user[$idx]->name = $name_new;
$this->user[$idx]->stat_set("room");
+ // MOP $this->user[$idx]->step_set(0);
$this->user[$idx]->subst = "standup";
$this->user[$idx]->lacc = $curtime;
$this->user[$idx]->laccwr = $curtime;
@@ -875,7 +912,7 @@ class brisco {
return ($this->user[$idx]);
}
- return (FALSE);
+ return ($G_false);
}
function standup_update(&$user)
@@ -899,8 +936,118 @@ class brisco {
}
}
+ // Static functions
+ function &init_data()
+ {
+ $room =& new Room();
+
+ return $room;
+ }
+
-} // end class brisco
+ function &load_data()
+ {
+ GLOBAL $G_false, $sess;
+
+ if (($tok = ftok(FTOK_PATH."/main", "B")) == -1) {
+ echo "FTOK FAILED";
+ exit;
+ }
+
+ if ($shm = shm_attach($tok, SHM_DIMS)) {
+ $room = @shm_get_var($shm, $tok);
+
+ log_only($sess, "bri == ".($room == FALSE ? "FALSE" : "TRUE")." bri === ".($room === FALSE ? "FALSE" : "TRUE")." bri isset ".(isset($room) ? "TRUE" : "FALSE"));
+ if (isset($room))
+ log_only($sess, "bri count ".count($room));
+
+ if ($room == FALSE) {
+ log_only($sess, "INIT MAIN DATA");
+
+ $room =& Room::init_data();
+ if (shm_put_var($shm, $tok, $room) == FALSE) {
+ log_only($sess, "PUT_VAR FALLITA ".strlen(serialize($room)));
+ log_only($sess, serialize($room));
+ }
+ }
+
+ shm_detach($shm);
+
+ $ret = &$room;
+ return ($ret);
+ }
+
+ return ($G_false);
+ }
+
+
+ function save_data(&$room)
+ {
+ GLOBAL $sess;
+
+ $ret = FALSE;
+ $shm = FALSE;
+ $isacq = FALSE;
+
+ // var_dump($room);
+
+ if (($tok = ftok(FTOK_PATH."/main", "B")) == -1)
+ return (FALSE);
+
+ do {
+ $isacq = TRUE;
+
+ if (($shm = shm_attach($tok, SHM_DIMS)) == FALSE)
+ break;
+
+ // log_only($sess, "PUT_VAR DI ".strlen(serialize($room)));
+ if (shm_put_var($shm, $tok, $room) == FALSE) {
+ log_only($sess, "PUT_VAR FALLITA ".strlen(serialize($room)));
+ log_only($sess, serialize($room));
+ break;
+ }
+ // log_main("XXX", "QUI CI ARRIVA [".$room->user[0]->name."]");
+ $ret = TRUE;
+ } while (0);
+
+ if ($shm)
+ shm_detach($shm);
+
+ return ($ret);
+ }
+
+ function lock_data()
+ {
+ GLOBAL $sess;
+
+ // echo "LOCK: ".FTOK_PATH."/main";
+ // exit;
+ if (($tok = ftok(FTOK_PATH."/main", "B")) == -1) {
+ echo "FTOK FAILED";
+ exit;
+ }
+ // echo "FTOK ".$tok."
";
+ if (($res = sem_get($tok)) == FALSE) {
+ echo "SEM_GET FAILED";
+ exit;
+ }
+ if (sem_acquire($res)) {
+ log_only($sess, "LOCK");
+ return ($res);
+ }
+ else
+ return (FALSE);
+ }
+
+ function unlock_data($res)
+ {
+ GLOBAL $sess;
+
+ log_only($sess, "UNLOCK");
+
+ return (sem_release($res));
+ }
+} // end class Room
function make_seed()
{
@@ -908,6 +1055,28 @@ function make_seed()
return (float) $sec + ((float) $usec * 100000);
}
+function log_only2($sess, $log) {
+ if (BRISK_DEBUG != TRUE)
+ return;
+
+
+ if (($fp = @fopen("/tmp/brisk_only2.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+ fclose($fp);
+ }
+}
+
+function log_only($sess, $log) {
+ if (BRISK_DEBUG != TRUE)
+ return;
+
+
+ if (($fp = @fopen("/tmp/brisk_only.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+ fclose($fp);
+ }
+}
+
function log_main($sess, $log) {
if (BRISK_DEBUG != TRUE)
return;
@@ -1001,40 +1170,6 @@ function log_legal($timecur, $sess, $name, $where, $mesg)
-function init_data()
-{
- $brisco =& new brisco();
-
- return $brisco;
-}
-
-function lock_data()
-{
- // echo "LOCK: ".FTOK_PATH."/main";
- // exit;
- if (($tok = ftok(FTOK_PATH."/main", "B")) == -1) {
- echo "FTOK FAILED";
- exit;
- }
- // echo "FTOK ".$tok."
";
- if (($res = sem_get($tok)) == FALSE) {
- echo "SEM_GET FAILED";
- exit;
- }
- if (sem_acquire($res)) {
- log_lock($sess, "LOCK");
- return ($res);
- }
- else
- return (false);
-}
-
-function unlock_data($res)
-{
- log_lock($sess, "UNLOCK");
- return (sem_release($res));
-}
-
function lock_banlist()
{
@@ -1049,7 +1184,7 @@ function lock_banlist()
if (sem_acquire($res))
return ($res);
else
- return (false);
+ return (FALSE);
}
function unlock_banlist($res)
@@ -1057,63 +1192,6 @@ function unlock_banlist($res)
return (sem_release($res));
}
-
-function &load_data()
-{
- if (($tok = ftok(FTOK_PATH."/main", "B")) == -1) {
- echo "FTOK FAILED";
- exit;
- }
-
- if ($shm = shm_attach($tok, SHM_DIMS)) {
- if(($bri = @shm_get_var($shm, $tok)) == false) {
- log_main("XXX", "INIT MAIN DATA");
-
- $bri = init_data();
- shm_put_var($shm, $tok, $bri);
- }
-
- shm_detach($shm);
-
- $ret = &$bri;
- return ($ret);
- }
-
- return (NULL);
-}
-
-
-function save_data(&$bri)
-{
- $ret = FALSE;
- $shm = FALSE;
- $isacq = FALSE;
-
- // var_dump($bri);
-
- if (($tok = ftok(FTOK_PATH."/main", "B")) == -1)
- return (FALSE);
-
- do {
- $isacq = TRUE;
-
- if (($shm = shm_attach($tok, SHM_DIMS)) == FALSE)
- break;
-
- if (shm_put_var($shm, $tok, $bri) == FALSE) {
- echo "DANNO: ".strlen(serialize($bri));
- break;
- }
- // log_main("XXX", "QUI CI ARRIVA [".$bri->user[0]->name."]");
- $ret = TRUE;
- } while (0);
-
- if ($shm)
- shm_detach($shm);
-
- return ($ret);
-}
-
function table_act_content($isstanding, $sitted, $table, $cur_table)
{
$ret = "";
@@ -1132,30 +1210,30 @@ function table_act_content($isstanding, $sitted, $table, $cur_table)
return ($ret);
}
-function table_content($bri, $user, $table_idx)
+function table_content($room, $user, $table_idx)
{
$content = "";
-
+ $ret = "";
// TODO
//
// Si possono usare i dati nella classe table
//
$sess = $user->sess;
- $table = &$bri->table[$table_idx];
+ $table = &$room->table[$table_idx];
if ($user->stat != 'room')
return;
for ($i = 0 ; $i < $table->player_n ; $i++) {
- $user_cur = &$bri->user[$table->player[$i]];
+ $user_cur = &$room->user[$table->player[$i]];
if ($user_cur == $user)
{ $hilion = ""; $hilioff = ""; }
else
{ $hilion = ""; $hilioff = ""; }
- log_main($bri->user[$e]->name, sprintf("IN TABLE [%d]", $table_idx));
+ log_main($user_cur->name, sprintf("IN TABLE [%d]", $table_idx));
$content .= sprintf("%s%s%s
",$hilion, xcape($user_cur->name), $hilioff);
}
@@ -1169,7 +1247,7 @@ function table_content($bri, $user, $table_idx)
return ($ret);
}
-function standup_content(&$bri, $user)
+function standup_content(&$room, $user)
{
$ret = "";
$content = "";
@@ -1178,7 +1256,7 @@ function standup_content(&$bri, $user)
return;
for ($e = 0 , $ct = 0 ; $ct < 4 && $e < MAX_PLAYERS ; $e++) {
- if ($bri->user[$e]->sess == "" || $bri->user[$e]->stat != "room" || $bri->user[$e]->name == "")
+ if ($room->user[$e]->sess == "" || $room->user[$e]->stat != "room" || $room->user[$e]->name == "")
continue;
$ct++;
}
@@ -1186,20 +1264,20 @@ function standup_content(&$bri, $user)
$content .= sprintf('
', $ct);
for ($e = 0 , $ct = 0 ; $e < MAX_PLAYERS ; $e++) {
- if ($bri->user[$e]->sess == "" || $bri->user[$e]->stat != "room" || $bri->user[$e]->name == "")
+ if ($room->user[$e]->sess == "" || $room->user[$e]->stat != "room" || $room->user[$e]->name == "")
continue;
- if ($bri->user[$e]->subst == "standup") {
+ if ($room->user[$e]->subst == "standup") {
if (($ct % 4) == 0) {
$content .= '';
}
- if ($bri->user[$e] == $user)
+ if ($room->user[$e] == $user)
{ $hilion = ""; $hilioff = ""; }
else
{ $hilion = ""; $hilioff = ""; }
- $content .= sprintf('%s%s%s | ',$hilion, xcape($bri->user[$e]->name), $hilioff);
+ $content .= sprintf('%s%s%s | ',$hilion, xcape($room->user[$e]->name), $hilioff);
if (($ct % 4) == 3) {
$content .= '
';
}
@@ -1222,7 +1300,7 @@ function show_notify($text, $tout, $butt, $w, $h)
return sprintf('var noti = new notify(gst,"%s",%d,"%s",%d,%d);', $text, $tout, $butt, $w, $h);
}
-function briscola_show($bri, $table, $user)
+function briscola_show($room, $table, $user)
{
$ptnadd = "";
$ret = "";
@@ -1235,7 +1313,7 @@ function briscola_show($bri, $table, $user)
$ret .= sprintf('$("callerinfo").innerHTML = "Chiami%s:";', $ptnadd);
else
$ret .= sprintf('$("callerinfo").innerHTML = "Chiama %s%s:";',
- xcape($bri->user[$table->player[$table->asta_win]]->name), $ptnadd);
+ xcape($room->user[$table->player[$table->asta_win]]->name), $ptnadd);
$ret .= sprintf('$("caller").style.backgroundImage = \'url("img/brisk_caller_sand%d.png")\';',
$table->asta_win);
@@ -1278,16 +1356,17 @@ function multoval($mult)
return (sprintf("%d-plo", $mult));
}
-function show_table_info(&$bri, &$table, $table_pos)
+function show_table_info(&$room, &$table, $table_pos)
{
- $user = &$bri->user[$table->player[$table_pos]];
+ $ret = "";
+ $user = &$room->user[$table->player[$table_pos]];
$pnt_min = $table->points_n - MAX_POINTS < 0 ? 0 : $table->points_n - MAX_POINTS;
$noty = sprintf(' | ');
// Names.
for ($i = 0 ; $i < PLAYERS_N ; $i++)
- $noty .= sprintf('%s | ', xcape($bri->user[$table->player[$i]]->name));
+ $noty .= sprintf('%s | ', xcape($room->user[$table->player[$i]]->name));
$noty .= sprintf("
");
// Points.
@@ -1318,8 +1397,8 @@ function show_table_info(&$bri, &$table, $table_pos)
if ($win != $fri) {
$noty .= sprintf("
Nell'ultima mano ha chiamato %s, il socio era %s,
",
- xcape($bri->user[$win]->name),
- xcape($bri->user[$fri]->name));
+ xcape($room->user[$win]->name),
+ xcape($room->user[$fri]->name));
if ($table->old_pnt == 120) {
$noty .= sprintf("hanno fatto cappotto EBBRAVI!.
");
}
@@ -1332,7 +1411,7 @@ function show_table_info(&$bri, &$table, $table_pos)
}
else {
$noty .= sprintf("
Nell'ultima mano %s si è chiamato in mano,
",
- xcape($bri->user[$win]->name));
+ xcape($room->user[$win]->name));
if ($table->old_pnt == 120) {
$noty .= sprintf("ha fatto cappotto EBBRAVO!.
");
}
@@ -1347,7 +1426,7 @@ function show_table_info(&$bri, &$table, $table_pos)
if ($table->mazzo == $table_pos)
$noty .= "Fai tu il mazzo,";
else {
- $unam = xcape($bri->user[$table->player[$table->mazzo]]->name);
+ $unam = xcape($room->user[$table->player[$table->mazzo]]->name);
$noty .= "Il mazzo a $unam,";
}
@@ -1366,7 +1445,7 @@ function show_table_info(&$bri, &$table, $table_pos)
$noty .= " tocca a te giocare.";
}
else {
- $unam = xcape($bri->user[$table->player[$curplayer]]->name);
+ $unam = xcape($room->user[$table->player[$curplayer]]->name);
$noty .= " tocca a $unam giocare.";
}
@@ -1383,6 +1462,7 @@ function show_table_info(&$bri, &$table, $table_pos)
function root_wellcome($user)
{
GLOBAL $root_wellarr;
+ $ret = "";
for ($i = 0 ; $i < count($root_wellarr) ; $i++)
$ret .= sprintf('chatt_sub("ChanServ: ","%s");', str_replace('"', '\"', $root_wellarr[$i]));
@@ -1393,6 +1473,7 @@ function root_wellcome($user)
function table_wellcome($user)
{
GLOBAL $table_wellarr;
+ $ret = "";
for ($i = 0 ; $i < count($table_wellarr) ; $i++)
$ret .= sprintf('chatt_sub("ChanServ: ","%s");', str_replace('"', '\"', $table_wellarr[$i]));
@@ -1400,21 +1481,21 @@ function table_wellcome($user)
return ($ret);
}
-function show_room(&$bri, &$user)
+function show_room(&$room, &$user)
{
- $ret .= sprintf('gst.st = %d;', $user->step);
+ $ret = sprintf('gst.st = %d;', $user->step);
$ret .= sprintf('stat = "%s";', $user->stat);
$ret .= root_wellcome($user);
$ret .= sprintf('subst = "%s";', $user->subst);
$ret .= sprintf('$("myname").innerHTML = "%s";', xcape($user->name,ENT_COMPAT,"UTF-8"));
for ($i = 0 ; $i < TABLES_N ; $i++) {
- $ret .= table_content($bri, $user, $i);
+ $ret .= table_content($room, $user, $i);
$act_content = table_act_content(($user->subst == 'standup'),
- $bri->table[$i]->player_n, $i, $user->table);
+ $room->table[$i]->player_n, $i, $user->table);
$ret .= sprintf('$("table_act%d").innerHTML = "%s";', $i, $act_content);
}
- $ret .= standup_content($bri, $user);
+ $ret .= standup_content($room, $user);
return ($ret);
}
@@ -1431,14 +1512,14 @@ Examples of $is_transition, $is_again:
from table: asta cmd e tutti passano: TRUE, TRUE
from table: fine partita: TRUE, TRUE
*/
-function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
+function show_table(&$room, &$user, $sendstep, $is_transition, $is_again)
{
$table_idx = $user->table;
- $table = &$bri->table[$table_idx];
+ $table = &$room->table[$table_idx];
$table_pos = $user->table_pos;
$ret = "table_init();";
- $ret .= $table->exitlock_show(&$bri->user, $table_pos);
+ $ret .= $table->exitlock_show(&$room->user, $table_pos);
if (!$is_again) {
/* GENERAL STATUS */
$ret .= sprintf( 'gst.st = %d; stat = "%s"; subst = "%s"; table_pos = %d;',
@@ -1449,15 +1530,15 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
/* USERS INFO */
$ret .= sprintf('$("myname").innerHTML = "%s";', xcape($user->name,ENT_COMPAT,"UTF-8"));
$ret .= sprintf('set_names(" %s", " %s", " %s", " %s", " %s"); ',
- xcape($bri->user[$table->player[($table_pos)%PLAYERS_N]]->name),
- xcape($bri->user[$table->player[($table_pos+1)%PLAYERS_N]]->name),
- xcape($bri->user[$table->player[($table_pos+2)%PLAYERS_N]]->name),
- (PLAYERS_N == 3 ? "" : xcape($bri->user[$table->player[($table_pos+3)%PLAYERS_N]]->name)),
- (PLAYERS_N == 3 ? "" : xcape($bri->user[$table->player[($table_pos+4)%PLAYERS_N]]->name)));
+ xcape($room->user[$table->player[($table_pos)%PLAYERS_N]]->name),
+ xcape($room->user[$table->player[($table_pos+1)%PLAYERS_N]]->name),
+ xcape($room->user[$table->player[($table_pos+2)%PLAYERS_N]]->name),
+ (PLAYERS_N == 3 ? "" : xcape($room->user[$table->player[($table_pos+3)%PLAYERS_N]]->name)),
+ (PLAYERS_N == 3 ? "" : xcape($room->user[$table->player[($table_pos+4)%PLAYERS_N]]->name)));
}
/* NOTIFY FOR THE CARD MAKER */
if ($is_transition) { // && $user->subst == "asta" superfluo
- $ret .= show_table_info(&$bri, &$table, $table_pos);
+ $ret .= show_table_info(&$room, &$table, $table_pos);
}
if (!$is_again)
$ret .= table_wellcome($user);
@@ -1481,7 +1562,7 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
break;
}
}
- log_rd($sess, "O ".$o." VAL ".$table->card[$o]->value." Owner: ".$table->card[$o]->owner);
+ log_rd($user->sess, "O ".$o." VAL ".$table->card[$o]->value." Owner: ".$table->card[$o]->owner);
$ret .= sprintf( ' card_send(%d,%d,%d,%8.2f,%d);|', ($table->gstart + $e) % PLAYERS_N,
$i, ((($e + PLAYERS_N - $table_pos + $table->gstart) % PLAYERS_N) == 0 ?
@@ -1545,7 +1626,7 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
/* show users auction status */
$showst = "";
for ($i = 0 ; $i < PLAYERS_N ; $i++) {
- $user_cur = &$bri->user[$table->player[$i]];
+ $user_cur = &$room->user[$table->player[$i]];
$showst .= sprintf("%s%d", ($i == 0 ? "" : ", "),
($user_cur->asta_card < 9 ? $user_cur->asta_card : $user_cur->asta_pnt));
}
@@ -1591,7 +1672,7 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
$ret .= "remark_off();";
/* WHO CALL AND WATH */
- $ret .= briscola_show($bri, $table, $user);
+ $ret .= briscola_show($room, $table, $user);
}
return ($ret);