From 440015e75749093a64016809118e64572a2ba99e Mon Sep 17 00:00:00 2001 From: "Matteo Nastasi (mop)" Date: Mon, 19 Nov 2012 08:08:47 +0100 Subject: [PATCH] old Bin5 management substituted with new --- web/Obj/brisk.phh | 78 +++++++++++++++--------------------------- web/Obj/sac-a-push.phh | 2 -- 2 files changed, 28 insertions(+), 52 deletions(-) diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index 2c060d2..b53cefb 100644 --- a/web/Obj/brisk.phh +++ b/web/Obj/brisk.phh @@ -1561,46 +1561,27 @@ class Room { } if ($to_tabl) { - // FIXME BRISK4: include for each kind of table - require_once("${G_base}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]; - // if the table is complete and exists its shared mem we get the info about users lacc - - if ($table_cur->player_n == PLAYERS_N) { - log_main("PLAYERS == N TABLE ".$table_idx); - - if (($sem = Bin5::lock_data(TRUE, $table_idx)) != FALSE) { - log_main("bin5 lock data success"); - - $no_recovery = FALSE; - if (($bri = Bin5::load_data($table_idx)) != FALSE) { - if ($table_cur->table_token != $bri->table_token) { - log_main("ERROR: not matching table_token. Room: ".$table_cur->table_token." Table: ".$bri->table_token); - $bri = FALSE; - } - } - - if ($bri != FALSE) { - $bri_table = $bri->table[0]; - for ($i = 0 ; $i < $bri_table->player_n ; $i++) { - // stat must be "table" by definition - $bri_user = $bri->user[$i]; + // FIXME BRISK4: include for each kind of table + require_once("${G_base}briskin5/Obj/briskin5.phh"); + // Before all align times with table timeout + for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) { + if (isset($this->match[$table_idx])) { + $bri = $this->match[$table_idx]; + + $bri_table = $bri->table[0]; + for ($i = 0 ; $i < $bri_table->player_n ; $i++) { + // stat must be "table" by definition + $bri_user = $bri->user[$i]; - if ($target != "" && $bri_user->name != $target) - continue; - log_main("writa: ".$user_mesg); - $bri_user->comm[$bri_user->step % COMM_N] = "gst.st = ".($bri_user->step+1)."; "; - $bri_user->comm[$bri_user->step % COMM_N] .= $to_tabl; - $bri_user->step_inc(); - } - Bin5::save_data($bri); - } - Bin5::unlock_data($sem); - } // bri::lock_data - } // if ($table_cur->player_n == PLAYERS_N) { - } // for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) { + if ($target != "" && $bri_user->name != $target) + continue; + log_main("writa: ".$user_mesg); + $bri_user->comm[$bri_user->step % COMM_N] = "gst.st = ".($bri_user->step+1)."; "; + $bri_user->comm[$bri_user->step % COMM_N] .= $to_tabl; + $bri_user->step_inc(); + } + } // if (isset($this->match + } // for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) { } // if ($to_tabl == true ... if ($update_room) { @@ -1748,18 +1729,15 @@ 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("${G_base}briskin5/Obj/briskin5.phh"); - if (($brisem = Bin5::lock_data(TRUE, $table_idx)) != FALSE) { - if (($bri = Bin5::load_data($table_idx)) != FALSE) { - if ($bri->the_end != TRUE) { - $bri->user[$ghost_user->table_pos]->step_inc(); - $bri->user[$ghost_user->table_pos]->sess = $sess; - Bin5::save_data($bri); - } + require_once("${G_base}briskin5/Obj/briskin5.phh"); + if (isset($this->match[$table_idx])) { + $bri = $this->match[$table_idx]; + + if ($bri->the_end != TRUE) { + $bri->user[$ghost_user->table_pos]->step_inc(); + $bri->user[$ghost_user->table_pos]->sess = $sess; + } } - Bin5::unlock_data($brisem); - } } $idx = $ghost; diff --git a/web/Obj/sac-a-push.phh b/web/Obj/sac-a-push.phh index c140192..5d62a37 100644 --- a/web/Obj/sac-a-push.phh +++ b/web/Obj/sac-a-push.phh @@ -1,5 +1,4 @@