X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2FObj%2Fbrisk.phh;h=4fefa542199bd56c1e3ef1e6e9648cc75db906cd;hb=fab43428bee37a9a8f1a2955d27a5da38f3b02ed;hp=63656edf2a743c23141f6a16f096e680c8a02836;hpb=16ee6bb0f47aa75592741f51523b47b61255a347;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 63656ed..4fefa54 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -27,7 +27,7 @@ define(BRISK_CONF, "brisk.conf.pho");
define(FTOK_PATH, "/var/lib/brisk");
define(LEGAL_PATH, "/tmp/legal_brisk");
define(PROXY_PATH, "/var/lib/brisk_proxy");
-define(TABLES_N, 32);
+define(TABLES_N, 36);
define(PLAYERS_N, 3);
define(MAX_POINTS, 5);
define(MAX_PLAYERS, (20 + (PLAYERS_N * TABLES_N)));
@@ -80,10 +80,10 @@ $G_lng = "";
// $G_lng = "_en";
$G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "2.1.6 - trusty";
+$G_brisk_version = "2.1.7 - trusty";
/* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = Array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': menu comandi e filtro sui non autenticati.',
+$root_wellarr = Array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': menu comandi, filtro opzionale sui non autenticati e "return bug" corretto.',
'Se vuoi iscriverti alla Mailing List, cliccala!' );
$G_room_help= '
@@ -144,6 +144,14 @@ function xcapelt($s)
return (str_replace($from, $to, $s));
}
+function xcapemesg($s)
+{
+ $from = array ( "\n");
+ $to = array ( "\\n");
+
+ return (str_replace($from, $to, $s));
+}
+
class Table {
var $idx;
@@ -691,7 +699,7 @@ class Room {
$this->table[$i]->auth_only = FALSE;
}
*/
- if ($i < 16)
+ if ($i < 12)
$this->table[$i]->auth_only = TRUE;
else
$this->table[$i]->auth_only = FALSE;
@@ -709,6 +717,9 @@ class Room {
$curtime = time();
if ($force || $this->garbage_timeout < $curtime) {
+ // FIXME BRISK4: include for each kind of table
+ require_once("briskin5/Obj/briskin5.phh");
+
// Before all align times with table timeout
for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) {
$table_cur =& $this->table[$table_idx];
@@ -1481,6 +1492,8 @@ class Room {
}
if ($to_tabl) {
+ // FIXME BRISK4: include for each kind of table
+ require_once("briskin5/Obj/briskin5.phh");
// Before all align times with table timeout
for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) {
$table_cur =& $this->table[$table_idx];
@@ -1656,6 +1669,8 @@ class Room {
// If user at the table we need to update the table data too
$table_idx = $ghost_user->table;
if ($ghost_user->stat == "table" && $this->table[$table_idx]->player_n == PLAYERS_N) {
+ // FIXME BRISK4: include for each kind of table
+ require_once("briskin5/Obj/briskin5.phh");
if (($brisem = Briskin5::lock_data($table_idx)) != FALSE) {
if (($bri = &Briskin5::load_data($table_idx)) != FALSE) {
if ($bri->the_end != TRUE) {