BUGFIX: forgot to initialize a variable

[e-DoKo.git] / include / game.php

diff --git a/include/game.php b/include/game.php
index 3191793ced4ccc9a09131a4a684a5de3fb2986f8..bbaa5b3500a2e945c5d4a2b113806b0cdb4f2d40 100644 (file)
--- a/include/game.php
+++ b/include/game.php
@@ -57,17 +57,26 @@ if($gametype=="solo")
     $GT  = $gametype." ".$GT;
   }
 
-/* do we need to worry about Schweinchen? 
+/* do we need to worry about Schweinchen?
  * check gametype and rules
- * if yes, figure out if someone actually has Schweinchen  
+ * if yes, figure out if someone actually has Schweinchen
  * save information in $GAME
  */
 $ok=0;
-if( $gametype == 'normal' || $gametype == 'silent' || $gametype=='trump' )
-  if( in_array($RULES['schweinchen'],array('both','second','secondaftercall')) )
-     $ok=1;
+if( $gamestatus == 'pre' )
+  {
+    /* always need to use Schweinchen to figure out for example who has poverty */
+    $ok=1;
+  }
+else
+  {
+    /* in a game Schweinchen is not valid in all types of games */
+    if( $gametype == 'normal' || $gametype == 'silent' || $gametype=='trump' )
+      if( in_array($RULES['schweinchen'],array('both','second','secondaftercall')) )
+       $ok=1;
+  }
 
-if($ok)     
+if($ok)
 {
   /* need to check for Schweinchen */
   for($i=1;$i<5;$i++)
@@ -87,6 +96,8 @@ else
 }
 /* end check for Schweinchen */
 
+set_gametype($gametype); /* this sets the $CARDS variable */
+
 /* put everyting in a form */
 echo "<form action=\"index.php?action=game&me=$me\" method=\"post\">\n";
 
@@ -202,7 +213,7 @@ switch($mystatus)
   case 'init':
     /* here we ask the player if he is sick */
     $mycards = DB_get_hand($me);
-    sort($mycards);
+    $mycards = mysort($mycards,$gametype);
 
     /* output sickness of other playes, in case the already selected and are sitting in front of the current player */
     echo "\n<ul class=\"tricks\">\n";
@@ -324,7 +335,7 @@ switch($mystatus)
     if($mystatus=='check')
       {
        $mycards = DB_get_hand($me);
-       sort($mycards);
+       $mycards = mysort($mycards,$gametype);
 
        /* output sickness of other playes, in case the already selected and are sitting in front of the current player */
        echo "\n<ul class=\"tricks\">\n";
@@ -1118,6 +1129,7 @@ switch($mystatus)
       {
        $card   = $_REQUEST["card"];
        $handid = DB_get_handid('hash',$me);
+       $commentSchweinchen =""; /* used to add a comment when Schweinchen is being played */
 
        /* check if we have card and that we haven't played it yet*/
        /* set played in hand_card to true where hand_id and card_id*/
@@ -1164,10 +1176,11 @@ switch($mystatus)
                else
                  $GAME['schweinchen-second'] = 1; /* this must be the second fox */
 
-               if($GAME['schweinchen-second']==1 && $RULES['schweinchen']=='second' )
-                 DB_insert_comment("Schweinchen! ",$playid,$myid);
-               if($RULES['schweinchen']=='both' )
-                 DB_insert_comment("Schweinchen! ",$playid,$myid);
+               if( ($GAME['schweinchen-second']==1 && $RULES['schweinchen']=='second') || $RULES['schweinchen']=='both')
+                 {
+                   DB_insert_comment("Schweinchen! ",$playid,$myid);
+                   $commentSchweinchen = "Schweinchen! ";
+                 }
                if ($debug)
                  echo "schweinchen = ".$GAME["schweinchen-who"]." ---<br />";
              }
@@ -1310,6 +1323,8 @@ switch($mystatus)
                $comment = $_REQUEST["comment"];
                if($comment != "")
                  DB_insert_comment($comment,$playid,$myid);
+               if($commentSchweinchen)
+                 $comment = $commentSchweinchen . $comment;
              };
 
            /* check for note */
@@ -1710,7 +1725,10 @@ switch($mystatus)
 
          foreach($mycards as $card)
            {
-             if($followsuit && !same_type($card,$firstcard))
+             if( ($followsuit && !same_type($card,$firstcard)) ||
+                 ( (int)($card)==19 && ($RULES['schweinchen']=='second'||$RULES['schweinchen']=='secondaftercall')
+                   && $GAME['schweinchen-who']==$me && !$GAME['schweinchen-first'] )
+                 )
                display_card($card,$PREF["cardset"]);
              else
                display_link_card($card,$PREF["cardset"]);