X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Ffunctions.php;h=bbffe00057617ae6c3f2e0e51b108b2ea765cbed;hp=382b1488f20512864a68e6091c3e5f3b913e2d2d;hb=e19f27d6e8d5dfa770037fec391ffc22ee7ca259;hpb=880dfb2e715a3770de56fb525f5c90d28a6ccb4c

diff --git a/include/functions.php b/include/functions.php
index 382b148..bbffe00 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -171,14 +171,14 @@ function compare_cards($a,$b,$game)
     case "normal":
     case "silent":
     case "trump":
-      if($RULES["schweinchen"]=="both" && $GAME["schweinchen"])
+      if($RULES['schweinchen']=='both' && $GAME['schweinchen-who'])
 	{
 	  if($a == 19 || $a == 20 )
 	    return 1;
 	  if($b == 19 || $b == 20 )
 	    return 0;
 	};
-      if($RULES["schweinchen"]=="second" && $GAME["schweinchen"]==3)
+      if($RULES['schweinchen']=='second' && $GAME['schweinchen-second'])
 	{
 	  if($a == 19 || $a == 20 )
 	    return 1;
@@ -367,17 +367,17 @@ function  create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD)
   if($debug)
     {
       $r[ 0]=1;     $r[12]=47;   $r[24]=13;       $r[36]=37;
-      $r[ 1]=2;     $r[13]=48;   $r[25]=14;	  $r[37]=38;
+      $r[ 1]=2;     $r[13]=23;   $r[25]=14;	  $r[37]=38;
       $r[ 2]=3;     $r[14]=27;   $r[26]=15;	  $r[38]=39;
       $r[ 3]=4;     $r[15]=16;   $r[27]=28;	  $r[39]=40;
       $r[ 4]=5;     $r[16]=17;   $r[28]=29;	  $r[40]=41;
       $r[ 5]=18;    $r[17]=6;    $r[29]=30;	  $r[41]=42;
-      $r[ 6]=19;    $r[18]=7;    $r[30]=31;	  $r[42]=43;
-      $r[ 7]=20;    $r[19]=8;    $r[31]=32;	  $r[43]=44;
-      $r[ 8]=45;    $r[20]=9;    $r[32]=21;	  $r[44]=33;
-      $r[ 9]=46;    $r[21]=10;   $r[33]=22;	  $r[45]=34;
-      $r[10]=35;    $r[22]=11;   $r[34]=23;	  $r[46]=25;
-      $r[11]=36;    $r[23]=12;   $r[35]=24;	  $r[47]=26;
+      $r[ 6]=21;    $r[18]=7;    $r[30]=31;	  $r[42]=43;
+      $r[ 7]=22;    $r[19]=8;    $r[31]=32;	  $r[43]=44;
+      $r[ 8]=45;    $r[20]=9;    $r[32]=19;	  $r[44]=33;
+      $r[ 9]=46;    $r[21]=10;   $r[33]=20;	  $r[45]=24;
+      $r[10]=35;    $r[22]=11;   $r[34]=48;	  $r[46]=25;
+      $r[11]=36;    $r[23]=12;   $r[35]=34;	  $r[47]=26;
     }
   else
     {
@@ -572,7 +572,7 @@ function sort_comp($a,$b)
 
   $ALL = array();
   $ALL = array_merge($CARDS["trump"],$CARDS["diamonds"],$CARDS["clubs"],
-		     $CARDS["hearts"],$CARDS["spades"],$CARDS["diamonds"]);
+		     $CARDS["hearts"],$CARDS["spades"]);
 
   return pos_array($a,$ALL)-pos_array($b,$ALL);
 }
@@ -664,6 +664,7 @@ function can_call($what,$hash)
 function display_table ()
 {
   global $gameid, $GT, $debug,$INDEX,$defaulttimezone;
+  global $RULES,$GAME,$gametype;
 
   $result = DB_query("SELECT  User.fullname as name,".
 		     "        Hand.position as position, ".
@@ -703,6 +704,10 @@ function display_table ()
 	echo "   <a href=\"".$INDEX."?action=game&me=".$hash."\">$name</a>\n";
 
       /* add hints for poverty, wedding, solo, etc */
+      if( $gametype != "solo")
+	if( $RULES["schweinchen"]=="both" && $GAME["schweinchen-who"]==$hash )
+	  echo " Schweinchen. <br />";
+
       if($GT=="poverty" && $party=="re")
 	if($sickness=="poverty")
 	  {