projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
computation and store of points and match state fixed
[brisk.git]
/
web
/
briskin5
/
Obj
/
briskin5.phh
diff --git
a/web/briskin5/Obj/briskin5.phh
b/web/briskin5/Obj/briskin5.phh
index
e5389da
..
1a1a899
100644
(file)
--- a/
web/briskin5/Obj/briskin5.phh
+++ b/
web/briskin5/Obj/briskin5.phh
@@
-405,6
+405,17
@@
class Bin5_table extends Table {
$this->mazzo = ($this->mazzo + $delta) % BIN5_PLAYERS_N;
}
$this->mazzo = ($this->mazzo + $delta) % BIN5_PLAYERS_N;
}
+ function mult_inc($val)
+ {
+ $this->old_mult = $this->mult;
+ $this->mult += $val;
+ }
+
+ function mult_set($val)
+ {
+ $this->old_mult = $this->mult;
+ $this->mult = $val;
+ }
function hand_points($idx)
{
function hand_points($idx)
{
@@
-454,8
+465,9
@@
class Bin5_table extends Table {
if ($action == BIN5_RULES_ALLPASS) { // return TRUE if all correct
$this->old_reason = "Hanno passato tutti.";
if ($action == BIN5_RULES_ALLPASS) { // return TRUE if all correct
$this->old_reason = "Hanno passato tutti.";
+ $this->old_asta_win = -1;
$this->old_pnt = 0;
$this->old_pnt = 0;
- $this->mult
+= 1
;
+ $this->mult
_inc(1)
;
for ($i = 0 ; $i < PLAYERS_N ; $i++) {
$pts[$i] = 0;
}
for ($i = 0 ; $i < PLAYERS_N ; $i++) {
$pts[$i] = 0;
}
@@
-468,8
+480,9
@@
class Bin5_table extends Table {
log_wr(sprintf("GIOCO FINITO !!!"));
$this->old_reason = sprintf("Ha lasciato %s perché aveva al massimo 2 punti.", xcape($user->name));
log_wr(sprintf("GIOCO FINITO !!!"));
$this->old_reason = sprintf("Ha lasciato %s perché aveva al massimo 2 punti.", xcape($user->name));
+ $this->old_asta_win = $user->table_pos;
$this->old_pnt = 0;
$this->old_pnt = 0;
- $this->mult
+= 1
;
+ $this->mult
_inc(1)
;
for ($i = 0 ; $i < PLAYERS_N ; $i++) {
$pts[$i] = 0;
for ($i = 0 ; $i < PLAYERS_N ; $i++) {
$pts[$i] = 0;
@@
-508,7
+521,7
@@
class Bin5_table extends Table {
}
$this->points_n++;
$this->old_pnt = $pro;
}
$this->points_n++;
$this->old_pnt = $pro;
- $this->mult
+= 1
;
+ $this->mult
_inc(1)
;
// return($pts);
break;
// return($pts);
break;
@@
-540,7
+553,8
@@
class Bin5_table extends Table {
}
$this->points_n++;
$this->old_pnt = $pro;
}
$this->points_n++;
$this->old_pnt = $pro;
- $this->mult = 0;
+ $this->old_asta_win = $this->asta_win;
+ $this->mult_set(0);
// return($pts);
} while (0);
// return($pts);
} while (0);
@@
-567,11
+581,10
@@
class Bin5_table extends Table {
$plist .= $codes;
log_legal($curtime, $user->ip, $user, "STAT:BRISKIN5:FINISH_GAME", $plist);
$plist .= $codes;
log_legal($curtime, $user->ip, $user, "STAT:BRISKIN5:FINISH_GAME", $plist);
- $this->old_mazzo = $this->mazzo;
$this->old_asta_pnt = $this->asta_pnt;
$this->old_asta_pnt = $this->asta_pnt;
-
$this->old_mult = $this->mult
;
- // $this->old_
pnt and $this->old_reaso
n are specific
- $this->old_asta_win = $this->asta_win;
+
// $this->old_mazzo is managed by ->game_next()
;
+ // $this->old_
mult, $this->old_pnt, $this->old_reason and $this->old_asta_wi
n are specific
+
$this->old_friend = $this->friend;
if ($user->table_orig < TABLES_AUTH_N) {
$this->old_friend = $this->friend;
if ($user->table_orig < TABLES_AUTH_N) {