From: Matteo Nastasi (mop) Date: Sat, 16 Feb 2008 09:37:49 +0000 (+0000) Subject: changed constants definition X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=faf9feed79ac32b41afc6bf4c954f92a028ab4ed;p=brisk.git changed constants definition --- diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh index b4001cb..2767c4e 100644 --- a/web/briskin5/Obj/briskin5.phh +++ b/web/briskin5/Obj/briskin5.phh @@ -1,5 +1,7 @@ user[$i]->sess) == 0) { // find it $idx = $i; @@ -58,7 +60,7 @@ class Briskin5 { } } log_main(sprintf("get_user: Wrong sess from page [%s]",$PHP_SELF)); - // for ($i = 0 ; $i < MAX_PLAYERS ; $i++) + // for ($i = 0 ; $i < BRISKIN5_MAX_PLAYERS ; $i++) // log_main(sprintf("get_user: Wrong sess compared with [%s]",$this->user[$i]->sess)); } else { @@ -77,7 +79,7 @@ class Briskin5 { $curtime = time(); if ($force || $this->garbage_timeout < $curtime) { - for ($i = 0 ; $i < MAX_BRISKIN5_PLAYERS ; $i++) { + for ($i = 0 ; $i < BRISKIN5_MAX_PLAYERS ; $i++) { $user_cur = &$this->user[$i]; if ($user_cur->sess == "" || ($user_cur->stat == 'table' && ($user_cur->subst == 'shutdowned' || $user_cur->subst == 'shutdowner'))) @@ -134,7 +136,7 @@ class Briskin5 { if (locshm_exists($tok) == FALSE) break; - if (($shm = shm_attach($tok, SHM_DIMS)) == FALSE) + if (($shm = shm_attach($tok, BRISKIN5_SHM_DIMS)) == FALSE) break; if (($bri = @shm_get_var($shm, $tok)) == FALSE) @@ -179,7 +181,7 @@ class Briskin5 { do { $isacq = TRUE; - if (($shm = shm_attach($bri->tok, SHM_DIMS)) == FALSE) + if (($shm = shm_attach($bri->tok, BRISKIN5_SHM_DIMS)) == FALSE) break; // log_only("PUT_VAR DI ".strlen(serialize($bri))); @@ -217,7 +219,7 @@ class Briskin5 { if (($tok = ftok(FTOK_PATH."/table".$table_idx, "B")) == -1) break; - if (($shm = shm_attach($tok, SHM_DIMS)) === FALSE) + if (($shm = shm_attach($tok, BRISKIN5_SHM_DIMS)) === FALSE) break; if (shm_remove($shm) === FALSE) { @@ -301,7 +303,7 @@ class Briskin5 { // change // update local graph // update remote graphs - for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + for ($i = 0 ; $i < BRISKIN5_MAX_PLAYERS ; $i++) { $user_cur = &$this->user[$i]; // if ($user_cur->sess == '' || $user_cur->stat != 'room') if ($user_cur->sess == '') @@ -313,13 +315,13 @@ class Briskin5 { break; } } - if ($i == MAX_PLAYERS) { + if ($i == BRISKIN5_MAX_PLAYERS) { $user->name = $name_new; log_main($user->sess." chatt_send start set"); - for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + for ($i = 0 ; $i < BRISKIN5_MAX_PLAYERS ; $i++) { log_main($user->sess." chatt_send set loop"); $user_cur = &$this->user[$i]; @@ -343,11 +345,11 @@ class Briskin5 { $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; "; $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('set_names(" %s", " %s", " %s", " %s", " %s"); ', - xcape($this->user[$table->player[($user_cur->table_pos)%PLAYERS_N]]->name), - xcape($this->user[$table->player[($user_cur->table_pos+1)%PLAYERS_N]]->name), - xcape($this->user[$table->player[($user_cur->table_pos+2)%PLAYERS_N]]->name), - (PLAYERS_N == 3 ? "" : xcape($this->user[$table->player[($user_cur->table_pos+3)%PLAYERS_N]]->name)), - (PLAYERS_N == 3 ? "" : xcape($this->user[$table->player[($user_cur->table_pos+4)%PLAYERS_N]]->name))); + xcape($this->user[$table->player[($user_cur->table_pos) % BRISKIN5_PLAYERS_N]]->name), + xcape($this->user[$table->player[($user_cur->table_pos+1) % BRISKIN5_PLAYERS_N]]->name), + xcape($this->user[$table->player[($user_cur->table_pos+2) % BRISKIN5_PLAYERS_N]]->name), + (BRISKIN5_PLAYERS_N == 3 ? "" : xcape($this->user[$table->player[($user_cur->table_pos+3) % BRISKIN5_PLAYERS_N]]->name)), + (BRISKIN5_PLAYERS_N == 3 ? "" : xcape($this->user[$table->player[($user_cur->table_pos+4) % BRISKIN5_PLAYERS_N]]->name))); if ($user_cur == $user) $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('$("myname").innerHTML = "%s";', xcape($user->name,ENT_COMPAT,"UTF-8")); @@ -357,7 +359,7 @@ class Briskin5 { } } else { - for ($i = 0 ; $i < ($user->stat == 'room' ? MAX_PLAYERS : PLAYERS_N) ; $i++) { + for ($i = 0 ; $i < ($user->stat == 'room' ? BRISKIN5_MAX_PLAYERS : BRISKIN5_PLAYERS_N) ; $i++) { if ($user->stat == 'room') { $user_cur = &$this->user[$i]; if ($user_cur->sess == '' || $user_cur->stat != 'room') diff --git a/web/briskin5/index_wr.php b/web/briskin5/index_wr.php index 7c6bc65..9f070f9 100644 --- a/web/briskin5/index_wr.php +++ b/web/briskin5/index_wr.php @@ -54,7 +54,7 @@ log_wr('POSTSPLIT: '.$argz[0]); if ($argz[0] == 'shutdown') { log_auth($user_cur->sess, "Shutdown session. delegate to room gc the autologout"); - log_rd2("AUTO LOGOUT."); + log_rd2("bin5/index_wr.php: AUTO LOGOUT."); if ($user->stat == 'table') { $bri->table_wakeup(&$user); // to force the logout @@ -112,12 +112,12 @@ else if ($user->stat == 'table') { } else if ($argz[0] == 'exitlock') { $user->exitislock = ($user->exitislock == TRUE ? FALSE : TRUE); - for ($ct = 0, $i = 0 ; $i < PLAYERS_N ; $i++) { + for ($ct = 0, $i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) { $user_cur[$i] = &$bri->user[$table->player[$i]]; if ($user_cur[$i]->exitislock == FALSE) $ct++; } - for ($i = 0 ; $i < PLAYERS_N ; $i++) { + for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) { $ret = sprintf('gst.st = %d;', $user_cur[$i]->step+1); $ret .= sprintf('exitlock_show(%d, %s);', $ct, ($user_cur[$i]->exitislock ? 'true' : 'false')); @@ -128,7 +128,7 @@ else if ($user->stat == 'table') { } else if ($user->subst == 'asta') { if ($argz[0] == 'lascio' && $user->handpt <= 2) { - $index_cur = $table->gstart % PLAYERS_N; + $index_cur = $table->gstart % BRISKIN5_PLAYERS_N; log_wr(sprintf("GIOCO FINITO !!!")); @@ -138,7 +138,7 @@ else if ($user->stat == 'table') { $table->game_next(); $table->game_init(&$bri->user); - for ($i = 0 ; $i < PLAYERS_N ; $i++) { + for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) { $user_cur = &$bri->user[$table->player[$i]]; $ret = sprintf('gst.st = %d;', $user_cur->step+1); @@ -150,7 +150,7 @@ else if ($user->stat == 'table') { else if ($argz[0] == 'asta') { $again = TRUE; - $index_cur = $table->gstart % PLAYERS_N; + $index_cur = $table->gstart % BRISKIN5_PLAYERS_N; if ($user->table_pos == $index_cur && $table->asta_pla[$index_cur]) { $a_card = $argz[1]; @@ -197,17 +197,17 @@ else if ($user->stat == 'table') { else { /* next step */ $showst = "show_astat("; - for ($i = 0 ; $i < PLAYERS_N ; $i++) { + for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) { $user_cur = &$bri->user[$table->player[$i]]; $showst .= sprintf("%s%d", ($i == 0 ? "" : ", "), ($user_cur->asta_card < 9 ? $user_cur->asta_card : $user_cur->asta_pnt)); } - if (PLAYERS_N == 3) + if (BRISKIN5_PLAYERS_N == 3) $showst .= ",-2,-2"; $showst .= ");"; $maxcard = -2; - for ($i = 0 ; $i < PLAYERS_N ; $i++) { + for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) { $user_cur = &$bri->user[$table->player[$i]]; if ($maxcard < $user_cur->asta_card) $maxcard = $user_cur->asta_card; @@ -216,8 +216,8 @@ else if ($user->stat == 'table') { if (($table->asta_pla_n > ($maxcard > -1 ? 1 : 0)) && !($table->asta_card == 9 && $table->asta_pnt == 120)) { log_wr("ALLOPPA QUI"); - for ($i = 1 ; $i < PLAYERS_N ; $i++) { - $index_next = ($table->gstart + $i) % PLAYERS_N; + for ($i = 1 ; $i < BRISKIN5_PLAYERS_N ; $i++) { + $index_next = ($table->gstart + $i) % BRISKIN5_PLAYERS_N; if ($table->asta_pla[$index_next]) { log_wr("GSTART 1"); $table->gstart += $i; @@ -226,10 +226,10 @@ else if ($user->stat == 'table') { } - for ($i = 0 ; $i < PLAYERS_N ; $i++) { + for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) { $user_cur = &$bri->user[$table->player[$i]]; $ret = sprintf('gst.st = %d; %s', $user_cur->step+1, $showst); - if ($user_cur->table_pos == ($table->gstart % PLAYERS_N)) + if ($user_cur->table_pos == ($table->gstart % BRISKIN5_PLAYERS_N)) $ret .= sprintf('dispose_asta(%d,%d, %s); remark_on();', $table->asta_card + 1, $table->asta_pnt+1, ($user_cur->handpt <= 2 ? "true" : "false")); else @@ -250,7 +250,7 @@ else if ($user->stat == 'table') { $table->game_next(); $table->game_init(&$bri->user); - for ($i = 0 ; $i < PLAYERS_N ; $i++) { + for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) { $user_cur = &$bri->user[$table->player[$i]]; $ret = sprintf('gst.st = %d;', $user_cur->step+1); @@ -264,7 +264,7 @@ else if ($user->stat == 'table') { // if a_pnt == 120 supergame ! else abbandono if ($a_pnt == 120 || $user->asta_card != -1) { $chooser = $index_cur; - for ($i = 1 ; $i < PLAYERS_N ; $i++) + for ($i = 1 ; $i < BRISKIN5_PLAYERS_N ; $i++) if ($i != $chooser) $table->asta_pla[$i] = FALSE; } @@ -272,8 +272,8 @@ else if ($user->stat == 'table') { //"gst.st = ".($user->step+1)."; dispose_asta(".($table->asta_card + 1).",".-($table->asta_pnt).", true); remark_off();"; $user->comm[$user->step % COMM_N] = sprintf( "gst.st = %d; dispose_asta(%d, %d, false); remark_off();", $user->step+1, $table->asta_card + 1,-($table->asta_pnt)); $user->step_inc(); - for ($i = 1 ; $i < PLAYERS_N ; $i++) { - $chooser = ($table->gstart + $i) % PLAYERS_N; + for ($i = 1 ; $i < BRISKIN5_PLAYERS_N ; $i++) { + $chooser = ($table->gstart + $i) % BRISKIN5_PLAYERS_N; if ($table->asta_pla[$chooser]) { break; } @@ -281,7 +281,7 @@ else if ($user->stat == 'table') { } $table->asta_win = $chooser; - for ($i = 0 ; $i < PLAYERS_N ; $i++) { + for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) { $user_cur = &$bri->user[$table->player[$i]]; $ret = sprintf('gst.st = %d; %s', $user_cur->step+1, $showst); @@ -311,12 +311,12 @@ else if ($user->stat == 'table') { $table->briscola = $a_brisco; $table->friend = $table->card[$a_brisco]->owner; log_wr("GSTART 2"); - $table->gstart = ($table->mazzo+1) % PLAYERS_N; + $table->gstart = ($table->mazzo+1) % BRISKIN5_PLAYERS_N; log_wr("Setta la briscola a ".$a_brisco); $chooser = $table->asta_win; $user_chooser = &$bri->user[$table->player[$chooser]]; - for ($i = 0 ; $i < PLAYERS_N ; $i++) { + for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) { $user_cur = &$bri->user[$table->player[$i]]; $user_cur->subst = 'game'; $ret = sprintf('gst.st = %d; subst = "game";', $user_cur->step+1); @@ -326,7 +326,7 @@ else if ($user->stat == 'table') { $ret .= briscola_show($bri, $table, $user_cur); /* first gamer */ - if ($i == ($table->gstart % PLAYERS_N)) + if ($i == ($table->gstart % BRISKIN5_PLAYERS_N)) $ret .= "is_my_time = true; remark_on();"; else $ret .= "is_my_time = false; remark_off();"; @@ -357,14 +357,14 @@ else if ($user->stat == 'table') { $a_y = substr($a_y,0,-2); $loggo = sprintf("A_play %s, table_pos %d == %d, mazzo %d, gstart %d, card_stat %d, card_own %d", - $a_play, $user->table_pos, ($table->gstart % PLAYERS_N), + $a_play, $user->table_pos, ($table->gstart % BRISKIN5_PLAYERS_N), $table->mazzo, $table->gstart, $table->card[$a_play]->stat, $table->card[$a_play]->owner); log_wr("CIC".$loggo); /* se era il suo turno e la carta era sua ed era in mano */ if ($a_play >=0 && $a_play < 40 && - ($user->table_pos == (($table->gstart + $table->turn) % PLAYERS_N)) && + ($user->table_pos == (($table->gstart + $table->turn) % BRISKIN5_PLAYERS_N)) && $table->card[$a_play]->stat == 'hand' && $table->card[$a_play]->owner == $user->table_pos) { log_wr(sprintf("User: %s Play: %d",$user->name, $a_play)); @@ -375,23 +375,23 @@ else if ($user->stat == 'table') { /* * !!!! TURN INCREMENTED BEFORE !!!! */ - $turn_cur = ($table->gstart + $table->turn) % PLAYERS_N; + $turn_cur = ($table->gstart + $table->turn) % BRISKIN5_PLAYERS_N; $table->turn++; $card_play = sprintf("card_play(%d,%d,%d,%d);|", $user->table_pos, $a_play, $a_x, $a_y); - if (($table->turn % PLAYERS_N) != 0) { /* manche not finished */ - $turn_nex = ($table->gstart + $table->turn) % PLAYERS_N; + if (($table->turn % BRISKIN5_PLAYERS_N) != 0) { /* manche not finished */ + $turn_nex = ($table->gstart + $table->turn) % BRISKIN5_PLAYERS_N; $player_cur = "remark_off();"; $player_nex = $card_play . "is_my_time = true; remark_on();"; $player_oth = $card_play; } - else if ($table->turn <= (PLAYERS_N * 8)) { /* manche finished */ + else if ($table->turn <= (BRISKIN5_PLAYERS_N * 8)) { /* manche finished */ $winner = calculate_winner($table); log_wr("GSTART 3"); $table->gstart = $winner; - $turn_nex = ($table->gstart + $table->turn) % PLAYERS_N; + $turn_nex = ($table->gstart + $table->turn) % BRISKIN5_PLAYERS_N; log_wr(sprintf("The winner is: [%d] [%s]", $winner, $bri->user[$table->player[$winner]]->name)); $card_take = sprintf("sleep(gst,2000);|cards_take(%d);|cards_hidetake($d);", @@ -401,13 +401,13 @@ else if ($user->stat == 'table') { $player_nex = $card_play . $card_take . "|"; else $player_nex = ""; - if ($table->turn < (PLAYERS_N * 8)) /* game NOT finished */ + if ($table->turn < (BRISKIN5_PLAYERS_N * 8)) /* game NOT finished */ $player_nex .= "is_my_time = true; remark_on();"; $player_oth = $card_play . $card_take; } log_wr(sprintf("Turn Cur %d Turn Nex %d",$turn_cur, $turn_nex)); - for ($i = 0 ; $i < PLAYERS_N ; $i++) { + for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) { $user_cur = &$bri->user[$table->player[$i]]; $ret = sprintf('gst.st = %d; ', $user_cur->step+1); @@ -429,7 +429,7 @@ else if ($user->stat == 'table') { - if ($table->turn == (PLAYERS_N * 8)) { /* game finished */ + if ($table->turn == (BRISKIN5_PLAYERS_N * 8)) { /* game finished */ log_wr(sprintf("GIOCO FINITO !!!")); /* ************************************************ */ @@ -440,14 +440,14 @@ else if ($user->stat == 'table') { $table->game_next(); $table->game_init(&$bri->user); - for ($i = 0 ; $i < PLAYERS_N ; $i++) { + for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) { $user_cur = &$bri->user[$table->player[$i]]; $retar[$i] .= show_table(&$bri,&$user_cur,$user_cur->step+1,TRUE, TRUE); } } - for ($i = 0 ; $i < PLAYERS_N ; $i++) { + for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) { $user_cur = &$bri->user[$table->player[$i]]; $user_cur->comm[$user_cur->step % COMM_N] = $retar[$i];