CLEANUP: cleaned up code for Karlchen

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

diff --git a/include/game.php b/include/game.php
index 3cc1d656489e853fb2160adcae081d8f268d1b66..db27bde601dd75d743c62d99c0674f4ea07df303 100644 (file)
--- a/include/game.php
+++ b/include/game.php
@@ -668,7 +668,7 @@ switch($mystatus)
                mymail($user,$subject,$message);
              }
 
-           echo "</div>\n";
+           echo "</div>\n"; /* end div message */
            break;
          }
        else if($poverty==1) /* one person has poverty */
@@ -807,7 +807,7 @@ switch($mystatus)
                  }
              }
            else
-             echo "<div class=\"message\">Please, <a href=\"$INDEX?action=game&amp;me=$me\">start</a> the game.</div>\n";
+             echo "Please, <a href=\"$INDEX?action=game&amp;me=$me\">start</a> the game.<br />\n";
          }
        else
          {
@@ -817,7 +817,7 @@ switch($mystatus)
 
            $whoid = DB_get_userid('gameid-position',$gameid,$who);
            if($whoid==$myid)
-             echo "<div class=\"message\">Please, <a href=\"$INDEX?action=game&amp;me=$me\">start</a> the game.</div>\n";
+             echo "Please, <a href=\"$INDEX?action=game&amp;me=$me\">start</a> the game.<br /\n";
            else
              {
                $whohash = DB_get_hash_from_game_and_pos($gameid,$who);
@@ -836,7 +836,7 @@ switch($mystatus)
        echo "</div>\n";
        break;
       }
-    echo "</div>\n";
+
   case 'poverty':
     /* user only gets here in a poverty game, several things have to be handled here:
      * A) ask, if user wants to take trump
@@ -894,7 +894,7 @@ switch($mystatus)
        /* get information so show the cards that have been handed over in a poverty game */
        output_exchanged_cards();
 
-       echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
+       echo "    </div>\n  </li>\n</ul>\n\n";  /* end div trick, end li trick , end ul tricks */
       }
     /* end output pre-game trick */
 
@@ -1524,28 +1524,31 @@ switch($mystatus)
 
                /* same as for foxes, karlchen doesn't always make sense
                 * check what kind of game it is and set karlchen accordingly */
-               $ok = 1; /* default: karlchen should be accounted for */
-               if($tricknr != 12 )
-                 $ok = 0; /* Karlchen works only in the last trick */
-               if($ok && DB_get_gametype_by_gameid($gameid)=='solo' )
+
+               if($tricknr == 12 ) /* Karlchen works only in the last trick */
                  {
-                   $solo = DB_get_solo_by_gameid($gameid);
-                   if($solo == 'trumpless' || $solo == 'jack' || $solo == 'queen' )
-                     $ok = 0; /* no Karlchen in these solos */
-                 }
+                   /* check for solo */
+                   $solo = 'none';
+                   if(DB_get_gametype_by_gameid($gameid)=='solo' )
+                     $solo = DB_get_solo_by_gameid($gameid);
 
-               if($ok)
-                 foreach($play as $played)
-                   if ( $played['card']==11 || $played['card']==12 )
-                     if ($played['pos'] == $winner )
-                       {
-                         /* possible caught a fox, check party */
-                         $uid1   = DB_get_userid('gameid-position',$gameid,$winner);
-                         $party1 = DB_get_party_by_gameid_and_userid($gameid,$uid1);
+                   /* no Karlchen in these solos */
+                   if($solo != 'trumpless' && $solo != 'jack' && $solo != 'queen' )
+                     {
+                       foreach($play as $played)
+                         if ( $played['card']==11 || $played['card']==12 )
+                           if ($played['pos'] == $winner )
+                             {
+                               /* save Karlchen */
+                               $uid1   = DB_get_userid('gameid-position',$gameid,$winner);
+                               $party1 = DB_get_party_by_gameid_and_userid($gameid,$uid1);
+
+                               DB_query("INSERT INTO Score".
+                                        " VALUES( NULL,NULL,$gameid,'$party1',$uid1,NULL,'karlchen')");
+                             };
+                     };
+                 }; /* end scoring Karlchen */
 
-                         DB_query("INSERT INTO Score".
-                                  " VALUES( NULL,NULL,$gameid,'$party1',$uid1,NULL,'karlchen')");
-                       }
                /*
                 * check for doppelopf (>40 points)
                 ***********************************/