X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=8bc7fd0b7924b8ea52b4157ffd1c952ef7702e7e;hb=0632c5a6e44489f41d3b13b2d81d67c9e916ffd3;hp=f679d003c0caf6c3ac4e481cba8c697d06f00d07;hpb=159f7722184524084a125e590f60478641401675;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index f679d00..8bc7fd0 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);
@@ -146,7 +145,7 @@ class Card {
     $this->stat = 'take'; // Card stat
     $this->owner = $newown;
   }
-}
+} // end class Card
 
 class Table {
   var $player;
@@ -187,12 +186,12 @@ class Table {
   {
     GLOBAL $G_false;
 
-    if (($thiz = new Table()) == FALSE)
+    if (($thiz =& new Table()) == FALSE)
       return ($G_false);
 
     $thiz->player    =   array();
     $thiz->player_n  =   0;
-    $thiz->card      =  &$thiz->bunch_create();
+    $thiz->card      =   FALSE;
     $thiz->asta_pla  =   array(); // TRUE: in auction, FALSE: out of the auction
     $thiz->asta_pla_n=  -1;
     $thiz->asta_card =  -1;
@@ -221,7 +220,7 @@ class Table {
   {
     GLOBAL $G_false;
     
-    if (($thiz = new Table()) == FALSE)
+    if (($thiz =& new Table()) == FALSE)
       return ($G_false);
     
     $thiz->player = array();
@@ -267,7 +266,7 @@ class Table {
       return ($G_false);
     
     $thiz->player_n = $from->player_n;
-    $thiz->card = $from->card;
+    $thiz->card = &$thiz->bunch_create();
     $thiz->mazzo = $from->mazzo;
     $thiz->gstart = $from->gstart;
     $thiz->turn = $from->turn;
@@ -463,7 +462,7 @@ class Table {
 
     return ($ct);
   }
-} // End class Table
+} // end class Table
   
 class User {
   var $name;       // name of the user
@@ -522,7 +521,7 @@ class User {
   {
     GLOBAL $G_false;
     
-    if (($thiz = new User()) == FALSE)
+    if (($thiz =& new User()) == FALSE)
       return ($G_false);
     
     $thiz->name       = $from->name;
@@ -636,7 +635,8 @@ class User {
     
     return (FALSE);
   }
-}
+} // end class User
+
 
 function step_get($sess) {
   $fp = FALSE;
@@ -724,6 +724,9 @@ class Room {
 	    }
 	    
 	    if ($bri != FALSE) {
+	      //
+	      //  SPAWN: JOIN
+	      //
 	      log_main("garbage_manager: bri loaded successfully.");
 	      $bri->garbage_manager(TRUE);
 	      
@@ -744,6 +747,7 @@ class Room {
 		  $user_cur->trans_step = $bri_user->step;
 		  $user_cur->lacc       = $bri_user->lacc;
 		  $user_cur->laccwr     = $bri_user->lacc;
+		  $user_cur->bantime    = $bri_user->bantime;
 		}
 	      
 		$this->room_join_wakeup(&$user_cur); 
@@ -970,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)