X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbrisk.phh;h=9db417c7154f9607d55303dce416c95f2d9a7bdf;hb=1c864a7f5b393bddf3ef4ce94886703d2ac3b21c;hp=df4c3f121d78b3692ceded6145f5616507298f48;hpb=3bdf570693a9c6be8e3bff5d62b21dae18817f27;p=brisk.git
diff --git a/web/brisk.phh b/web/brisk.phh
index df4c3f1..9db417c 100644
--- a/web/brisk.phh
+++ b/web/brisk.phh
@@ -34,6 +34,23 @@ define(NICKSERV, "SERVER");
define(BRISK_DEBUG, FALSE);
// define(DEBUGGING, "local");
+/*
+$root_wellarr = Array ( 'GOOGLE',
+ 'pinollo lanollo',
+ 'rorella liolla' );
+*/
+$root_wellarr = Array ( );
+$table_wellarr = Array ( );
+
+$G_brisk_version = "0.4.2";
+
+/*$G_room_help = '
+Brisk - Ver. '.$G_brisk_version.'
+Copyright 2006 Matteo Nastasi
';
+*/
+$G_room_help = 'Brisk - Ver. '.$G_brisk_version.'
Copyright 2006 Matteo Nastasi
';
+
+
function xcape($s)
{
$from = array ( '\\', '@', '|' );
@@ -222,8 +239,37 @@ class Table {
{
$this->player[$idx] = $player;
}
-}
+ function user_add($idx)
+ {
+ $this->player[$this->player_n] = $idx;
+ $this->player_n++;
+
+ return ($this->player_n - 1);
+ }
+
+ function user_rem(&$bri, &$user)
+ {
+ $tabpos = $user->table_pos;
+
+ /* verifico la consistenza dei dati */
+ if ($bri->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->table_pos = $i;
+ }
+ $this->player_n--;
+ }
+ else {
+ log_main($user->sess, "INCONSISTENCY ON TABLE.");
+ }
+ }
+
+} // End class Table
+
class User {
var $name; // name of the user
var $sess; // session of the user
@@ -346,14 +392,10 @@ class brisco {
}
}
}
+
/* aggiorna l'array dei giocatori al tavolo. */
- for ($i = $user->table_pos ; $i < $table->player_n-1 ; $i++) {
- $table->player[$i] = $table->player[$i+1];
- $user_cur = &$this->user[$table->player[$i]];
- $user_cur->table_pos = $i;
- }
- $this->table[$table_idx]->player_n--;
-
+ $table->user_rem(&$this, &$user);
+
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
$user_cur = &$this->user[$i];
if ($user_cur->sess == '' || $user_cur->stat != 'room')
@@ -483,7 +525,7 @@ class brisco {
if (strncmp($user_mesg, "/nick ", 6) == 0) {
log_main($user->sess, "chatt_send BEGIN");
- $name_new = substr(trim(substr($user_mesg, 6)),0,12);
+ $name_new = str_replace(' ', '_', substr(trim(substr($user_mesg, 6)),0,12));
$user_mesg = "COMMAND ".$user_mesg;
// Search dup name
// change
@@ -514,7 +556,7 @@ class brisco {
continue;
if ($user_cur->stat == 'room') {
if ($user->stat == 'room' && $user->subst == 'standup') {
- standup_update(&$this,&$user);
+ $this->standup_update(&$user);
}
else if ($user->stat == 'room' && $user->subst == 'sitdown' ||
$user->stat == 'table') {
@@ -642,8 +684,28 @@ class brisco {
return (FALSE);
}
+ function standup_update(&$user)
+ {
+ for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
+ $user_cur = &$this->user[$i];
+ if ($user_cur->sess == '')
+ continue;
+
+ log_main("STANDUP START", $user_cur->stat);
+
+ if ($user_cur->stat == 'room') {
+ $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ".standup_content($this, $user_cur);
+ if ($user_cur == $user)
+ $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('$("myname").innerHTML = "%s: ";', xcape($user->name));
+
+ log_main("FROM STANDUP", "NAME: ".$user_cur->name." SENDED: ".$user_cur->comm[$user_cur->step % COMM_N]);
+
+ $user_cur->step++;
+ }
+ }
+ }
+
-
} // end class brisco
function make_seed()
@@ -863,7 +925,14 @@ function standup_content(&$bri, $user)
if ($user->stat != 'room')
return;
- $content .= '
%s%s%s | ',$hilion, xcape($bri->user[$e]->name), $hilioff); + $content .= sprintf('%s%s%s | ',$hilion, xcape($bri->user[$e]->name), $hilioff); if (($ct % 4) == 3) { $content .= ''; } @@ -894,35 +963,14 @@ function standup_content(&$bri, $user) return ($ret); } -function standup_update(&$bri, &$user) -{ - for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - $user_cur = &$bri->user[$i]; - if ($user_cur->sess == '') - continue; - - log_main("STANDUP START", $user_cur->stat); - - if ($user_cur->stat == 'room') { - $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ".standup_content($bri, $user_cur); - if ($user_cur == $user) - $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('$("myname").innerHTML = "%s: ";', xcape($user->name)); - - log_main("FROM STANDUP", "NAME: ".$user_cur->name." SENDED: ".$user_cur->comm[$user_cur->step % COMM_N]); - - $user_cur->step++; - } - } -} - -function show_notify($text, $tout, $butt) +function show_notify($anc, $text, $tout, $butt) { log_main("SHOW_NOTIFY", $text); - return sprintf('var noti = new notify(gst,$("bg"),"%s",%d,"%s");', $text, $tout,$butt); + return sprintf('var noti = new notify(gst,$("%s"),"%s",%d,"%s");', $anc, $text, $tout,$butt); } @@ -1055,17 +1103,37 @@ function show_table_info(&$bri, &$table, $table_pos) } $noty .= "