fixe placement of comment box in pre-game phase

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

diff --git a/include/game.php b/include/game.php
index eb66a987157c6bcd98ddbcf57f0ce343e7e7fcca..03dd259430f448812017daf2f539b8898c5de414 100644 (file)
--- a/include/game.php
+++ b/include/game.php
@@ -326,6 +326,7 @@ switch($mystatus)
       {
        /* asks the player, if he wants to join the game */
        output_check_want_to_play($me);
+       echo '<div class="mycards"></div>';
        break;
       }
     else
@@ -520,6 +521,7 @@ switch($mystatus)
 
            /* move on to the next stage*/
            DB_set_hand_status_by_hash($me,'check');
+           $mystatus='check';
          };
       };
 
@@ -834,6 +836,12 @@ switch($mystatus)
              }
          }
        echo "</div>\n";
+       /* show cards */
+       echo '<div class="mycards">'._('Your cards are').": <br />\n";
+       foreach($mycards as $card)
+         display_card($card,$PREF['cardset']);
+       echo "</div>\n";
+
        break;
       }
 
@@ -1990,6 +1998,39 @@ switch($mystatus)
        if(have_suit($mycards,$firstcard))
          $followsuit = 1;
 
+       /* count how many cards we can play, so that we can pre-select it if there is only one */
+       $howmanycards = 0;
+       foreach($mycards as $card)
+         {
+           if($howmanycards>1)
+             break;
+
+           /* 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 &&
+                 !$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 &&
+                 in_array($gametype,array('normal','wedding','trump','silent'))
+                 )
+               )
+             continue;
+           else
+             $howmanycards++;
+         }
+
+       if($howmanycards==1)
+         $howmanycards=1;
+       else
+         $howmanycards=0;
+
        foreach($mycards as $card)
          {
            /* display only cards that the player is allowed to play as links, the rest just display normal
@@ -2010,7 +2051,7 @@ switch($mystatus)
                )
              display_card($card,$PREF['cardset']);
            else
-             display_link_card($card,$PREF['cardset']);
+             display_link_card($card,$PREF['cardset'],$type='card',$selected=$howmanycards);
          }
       }
     else if($mystatus=='play' )