X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fgame.php;h=086a2f9074501c9bbd98e3c23ba47ad0414cbc4d;hp=613575bc4a75a328f45c7f9296859b2991254c92;hb=26aa6987c5da1f102e81c4625ed8e7b116c7590b;hpb=0329ae5dc48fee11545d6a4b37ba8522979e42d4
diff --git a/include/game.php b/include/game.php
index 613575b..086a2f9 100644
--- a/include/game.php
+++ b/include/game.php
@@ -25,7 +25,8 @@ if(!$myid)
global $GAME,$RULES,$CARDS;
/* the user has done something, update the timestamp */
-DB_update_user_timestamp($myid);
+if(isset($_SESSION['id']))
+ DB_update_user_timestamp($_SESSION['id']);
/* get some information from the DB */
$gameid = DB_get_gameid_by_hash($me);
@@ -36,7 +37,7 @@ $myhand = DB_get_handid('hash',$me);
$session = DB_get_session_by_gameid($gameid);
/* get prefs and save them in a variable*/
-$PREF = DB_get_PREF($myid);
+$PREF = DB_get_PREF(isset($_SESSION['id'])?$_SESSION['id']:$myid);
/* get rule set for this game */
$RULES = DB_get_RULES($gameid);
@@ -65,7 +66,7 @@ if( $gamestatus == 'pre' )
else
{
/* in a game Schweinchen is not valid in all types of games */
- if( $gametype == 'normal' || $gametype == 'silent' || $gametype=='trump' )
+ if( $gametype == 'normal' || $gametype == 'silent' || $gametype=='trump' || $gametype=='wedding')
if( in_array($RULES['schweinchen'],array('both','second','secondaftercall')) )
$ok=1;
}
@@ -108,7 +109,15 @@ if( $mystatus!='gameover' )
if($note != '')
DB_insert_note($note,$gameid,$myid);
};
-output_user_notes($myid,$gameid,$mystatus);
+
+/* make sure that we don't show the notes to the wrong person
+ * (e.g. other people looking at an old game)
+ */
+if( $mystatus != 'gameover' ||
+ ( $mystatus == 'gameover' &&
+ isset($_SESSION['id']) &&
+ $myid == $_SESSION['id']))
+ output_user_notes($myid,$gameid,$mystatus);
/* handle calls */
if(myisset('call') && $_REQUEST['call'] == '120' && can_call(120,$me))
@@ -126,17 +135,64 @@ if(myisset('call') && $_REQUEST['call'] == '0' && can_call(0,$me))
if($session)
{
echo "
\n";
+
+ /* figure out which game in a session we are in and link to the previous and next game if possible */
$hashes = DB_get_hashes_by_session($session,$myid);
+ $next = NULL;
$i = 1;
foreach($hashes as $hash)
{
@@ -146,8 +202,27 @@ if($session)
$lasthash=$hash;
}
$i--;
- echo "This is game number $j of $i in session $session.";
- echo "
\n";
+
+ if($j>1)
+ $previous = $hashes[$j-2];
+ else
+ $previous = NULL;
+ if($j<$i)
+ $next = $hashes[$j];
+ else
+ $next = NULL;
+
+ if(isset($_SESSION['id']) && $_SESSION['id']==$myid)
+ {
+ if($previous)
+ echo "previous game \n";
+ echo "This is game number $j of $i in session $session.\n";
+ if($next)
+ echo " next game \n";
+ }
+ else
+ echo "This is game number $j of $i in session $session.";
+ echo "\n
\n";
}
/* display the table and the names */
@@ -264,7 +339,7 @@ switch($mystatus)
$userstatus = DB_get_hand_status_by_userid_and_gameid($userid,$gameid);
if($userstatus=='start' || $userstatus=='init')
- echo "
still needs to decide
\n"; /* show this to everyone */
+ echo "
still needs to decide
\n"; /* show this to everyone */
else
if($usersick!=NULL && $pos<=$mypos ) /* only show this for people sitting before the player */
echo "
\n";
if($mygametype == $usersick)
@@ -1208,7 +1362,11 @@ switch($mystatus)
else
$GAME['schweinchen-second'] = 1; /* this must be the second fox */
- if( ($GAME['schweinchen-second']==1 && $RULES['schweinchen']=='second') || $RULES['schweinchen']=='both')
+ if( $RULES['schweinchen']=='both' ||
+ ($RULES['schweinchen']=='second' && $GAME['schweinchen-second']==1 )||
+ ($RULES['schweinchen']=='secondaftercall' && $GAME['schweinchen-second']==1 &&
+ (DB_get_call_by_hash($GAME['schweinchen-who']) || DB_get_partner_call_by_hash($GAME['schweinchen-who']) ))
+ )
{
DB_insert_comment('Schweinchen! ',$playid,$myid);
$commentSchweinchen = 'Schweinchen! ';
@@ -1478,7 +1636,7 @@ switch($mystatus)
{
if($call_contra==NULL)
$call_contra = $call;
- else if( $call < $call_re)
+ else if( $call < $call_contra)
$call_contra = $call;
}
}
@@ -1639,27 +1797,26 @@ switch($mystatus)
$message .= "Score Table:\n";
$message .= format_score_table_ascii($score);
+ $message .= "\nUse these links to have a look at game ".DB_format_gameid($gameid).": \n";
/* send out final email */
$all = array();
- foreach($userids as $user)
- $all[] = DB_get_email('userid',$user);
- $To = implode(",",$all);
-
- $help = "\n\n (you can use reply all on this email to reach all the players.)\n";
- mymail($To,$EmailName."game over (game ".DB_format_gameid($gameid).") part 1(2)",$message.$help);
-
foreach($userids as $user)
{
- $To = DB_get_email('userid',$user);
+ $all[] = DB_get_email('userid',$user);
+
+ /* add links for all players */
$hash = DB_get_hash_from_gameid_and_userid($gameid,$user);
+ $name = DB_get_name('userid',$user);
- $link = "Use this link to have a look at game ".DB_format_gameid($gameid).": ".
- $HOST.$INDEX."?action=game&me=".$hash."\n\n" ;
- if( DB_get_email_pref_by_uid($user) != 'emailaddict' )
- mymail($To,$EmailName."game over (game ".DB_format_gameid($gameid).") part 2(2)",$link);
+ $link = "$name: ".$HOST.$INDEX."?action=game&me=".$hash."\n" ;
+ $message .= $link;
}
+ $To = implode(",",$all);
+
+ $message .= "\n\n (you can use reply all on this email to reach all the players.)\n";
+ mymail($To,$EmailName."Game over (game ".DB_format_gameid($gameid).") ",$message);
}
}
else
@@ -1696,6 +1853,42 @@ switch($mystatus)
"
".$r[2]." ".$r[1]."
\n".
"
\n";
+ /* display totals */
+ $result = DB_query("SELECT Hand.party, IFNULL(SUM(Card.points),0) FROM Hand".
+ " LEFT JOIN Trick ON Trick.winner=Hand.position AND Trick.game_id=Hand.game_id".
+ " LEFT JOIN User ON User.id=Hand.user_id".
+ " LEFT JOIN Play ON Trick.id=Play.trick_id".
+ " LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id".
+ " LEFT JOIN Card ON Card.id=Hand_Card.card_id".
+ " WHERE Hand.game_id='$gameid'".
+ " GROUP BY Hand.party" );
+ echo "
\n"; /* end div trick, end li trick */
}
@@ -1719,9 +1912,15 @@ switch($mystatus)
foreach($mycards as $card)
{
+ /* display only cards that the player is allowed to play as links, the rest just display normal
+ * also check if we have both schweinchen, in that case only display on of them as playable
+ */
if( ($followsuit && !same_type($card,$firstcard)) ||
- ( (int)($card)==19 && ($RULES['schweinchen']=='second'||$RULES['schweinchen']=='secondaftercall')
- && $GAME['schweinchen-who']==$me && !$GAME['schweinchen-first'] )
+ ( (int)($card)==19 && !$GAME['schweinchen-first'] &&
+ ($RULES['schweinchen']=='second'||
+ ( $RULES['schweinchen']=='secondaftercall' &&
+ (DB_get_call_by_hash($GAME['schweinchen-who']) || DB_get_partner_call_by_hash($GAME['schweinchen-who']) )))
+ && $GAME['schweinchen-who']==$me )
)
display_card($card,$PREF['cardset']);
else
@@ -1771,61 +1970,38 @@ switch($mystatus)
if(DB_get_game_status_by_gameid($gameid)=='play')
{
echo "The game is over for you.. other people still need to play though";
- }
- else
- {
- $result = DB_query("SELECT Hand.party, IFNULL(SUM(Card.points),0) FROM Hand".
- " LEFT JOIN Trick ON Trick.winner=Hand.position AND Trick.game_id=Hand.game_id".
- " LEFT JOIN User ON User.id=Hand.user_id".
- " LEFT JOIN Play ON Trick.id=Play.trick_id".
- " LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id".
- " LEFT JOIN Card ON Card.id=Hand_Card.card_id".
- " WHERE Hand.game_id='$gameid'".
- " GROUP BY Hand.party" );
- echo "
\n";
-
-
}
break;
default:
myerror("error in testing the status");
}
-/* output left menu */
-display_user_menu();
-/* output right menu */
+/* output other games where it is the users turn
+ * make sure that the people looking at old games don't see the wrong games here
+ */
+if( $mystatus != 'gameover' )
+ display_user_menu($myid);
+else if( $mystatus == 'gameover' &&
+ isset($_SESSION['id']) )
+ {
+ display_user_menu($_SESSION['id']);
+ }
+else
+ {
+ echo "
\n";
+ echo "It's your turn in these games: \n";
+ echo "Please log in to see this information.\n";
+ echo "
\n";
+ }
/* display rule set for this game */
echo "
\n";
if($gamestatus == 'play' )
- output_form_calls($me);
-
+ {
+ $myparty = DB_get_party_by_hash($me);
+ output_form_calls($me,$myparty);
+ }
/* get time from the last action of the game */
$r = DB_query_array("SELECT mod_date from Game WHERE id='$gameid' " );
$gameend = time() - strtotime($r[0]);
@@ -1837,11 +2013,26 @@ if($gamestatus == 'play' || $gameend < 60*60*24*7)
echo "\n";
+/* has this hand been played by others? */
+$other_game_ids = DB_played_by_others($gameid);
+if(sizeof($other_game_ids)>0 && $mystatus=='gameover')
+ {
+ $mypos = DB_get_pos_by_hash($me);
+ echo "
See how other played the same hand: \n";
+ foreach($other_game_ids as $id)
+ {
+ $otherhash = DB_get_hash_from_game_and_pos($id,$mypos);
+ $othername = DB_get_name('hash',$otherhash);
+ echo "$othername ";
+ }
+ echo "