X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=29dbc6790c3f620d53084bb0614bfd207136996d;hb=c2fcedbadc3295bb207b9948174408eea2877f22;hp=34adcd1742d587fa7fe7dbc9a5d52162c06441f4;hpb=8861498f64b33d632aaf4f0b3b54a01503307531;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 34adcd1..29dbc67 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -26,8 +26,7 @@ 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(SHM_DIMS, (50000 + 10000 * TABLES_N + 15000 * MAX_PLAYERS));
 define(COMM_N, 12);
 define(COMM_GEN_N, 50);
 define(SESS_LEN, 13);
@@ -975,7 +974,7 @@ class Room {
 	if ($wup_idx < $user_wup_n) {
 	  log_main("JOIN_WAKEUP less");
 	  // set the new status 
-	  $ret .=  'subst = "standup"; ';
+	  $ret .=  'stat = "room"; subst = "standup"; ';
 	  // clean the action buttons in other tables
 	  for ($e = 0 ; $e < TABLES_N ; $e++) {
 	    if ($this->table[$e]->player_n < PLAYERS_N)
@@ -1415,10 +1414,8 @@ function log_only2($log) {
     $ssess = "XXXX";
   else
     $ssess = $sess;
-      
 
-  //   if (($fp = @fopen("/tmp/brisk_only2.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("ONL2: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
   }
@@ -1434,10 +1431,8 @@ function log_only($log) {
     $ssess = "XXXX";
   else
     $ssess = $sess;
-      
 
-  //  if (($fp = @fopen("/tmp/brisk_only.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("ONLY: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
   }
@@ -1453,10 +1448,8 @@ function log_main($log) {
     $ssess = "XXXX";
   else
     $ssess = $sess;
-      
 
-  //  if (($fp = @fopen("/tmp/brisk_main.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("MAIN: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
   }
@@ -1473,9 +1466,7 @@ function log_rd($log) {
   else
     $ssess = $sess;
       
-
-  //  if (($fp = @fopen("/tmp/brisk_rd.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("READ: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
   }
@@ -1493,8 +1484,7 @@ function log_rd2($log) {
     $ssess = $sess;
       
 
-  //  if (($fp = @fopen("/tmp/brisk_rd2.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("REA2: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
   }
@@ -1511,9 +1501,7 @@ function log_send($log) {
   else
     $ssess = $sess;
       
-
-  //  if (($fp = @fopen("/tmp/brisk_send.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("SEND: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
   }
@@ -1529,10 +1517,8 @@ function log_lock($log) {
     $ssess = "XXXX";
   else
     $ssess = $sess;
-      
 
-  //  if (($fp = @fopen("/tmp/brisk_lock.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("LOCK: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
   }
@@ -1549,9 +1535,7 @@ function log_wr($log) {
   else
     $ssess = $sess;
       
-
-  //  if (($fp = @fopen("/tmp/brisk_wr.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("WRIT: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
   }
@@ -1568,9 +1552,7 @@ function log_load($log) {
   else
     $ssess = $sess;
       
-
-  //  if (($fp = @fopen("/tmp/brisk_load.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("LOAD: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
   }
@@ -1580,8 +1562,7 @@ function log_auth($sess, $log) {
   if ((BRISK_DEBUG & DBG_AUTH) == 0)
     return;
 
-  //  if (($fp = @fopen("/tmp/brisk_auth.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("AUTH: [%s] [%d] [%s]\n", $sess, time(), $log));
     fclose($fp);
   }
@@ -1592,7 +1573,7 @@ function log_legal($timecur, $sess, $name, $where, $mesg)
 {
   GLOBAL $_SERVER;
 
-  if (($fp = @fopen(LEGAL_PATH, 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/legal.log", 'a')) != FALSE) {
     /* Unix time | session | nickname | IP | where was | mesg */
     fwrite($fp, sprintf("%ld|%s|%s|%s|%s|%s|\n", $timecur, $sess, $name, $_SERVER['REMOTE_ADDR'], $where , $mesg));
     fclose($fp);