LAYOUT: added an icon for the time information

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

diff --git a/include/game.php b/include/game.php
index b08f36b084b973bb86064eef351fa54fd2c0cbfe..845a5629b6cea269fab793e38ef4bff6b3b1af8d 100644 (file)
--- a/include/game.php
+++ b/include/game.php
@@ -215,12 +215,23 @@ if($session)
     $finalscore = array_pop($tmpscore);
     $finalscore = $finalscore['players'];
 
-    echo "  <div class=\"sessionscore\">Score: \n";
-    foreach($finalscore as $user=>$value)
+    echo "  <div class=\"sessionscore\">";
+    if($finalscore)
+      { 
+       echo "Score: \n";
+       /* output the final score on the front page */
+       foreach($finalscore as $user=>$value)
+         {
+           $name = DB_get_name('userid',$user);
+           echo " ".substr($name,0,2).": $value ";
+         }
+      }
+    else 
       {
-       $name = DB_get_name('userid',$user);
-       echo " ".substr($name,0,2).": $value ";
+       /* first game, no score yet */ 
+       echo "&nbsp;";
       }
+
     echo format_score_table_html($score,$myid);
     echo "  </div>\n";
 
@@ -782,9 +793,6 @@ switch($mystatus)
      * it is easier to check B) first
      */
 
-    /* output pre game in case user reloads */
-
-
     set_gametype($gametype); /* this sets the $CARDS variable */
     $myparty = DB_get_party_by_hash($me);
 
@@ -810,6 +818,25 @@ switch($mystatus)
     $mycards = DB_get_hand($me);
     $mycards = mysort($mycards,$gametype);
 
+    /* output pre-game trick in case user reloads,
+     * only needs to be done when a team has been formed */
+    if($myparty=='re' || $myparty=='contra')
+      {
+       echo "\n<ul class=\"tricks\">\n";
+       echo "  <li class=\"nohighlight\"> Game ".DB_format_gameid($gameid).": </li>\n";
+
+       $mygametype =  DB_get_gametype_by_gameid($gameid);
+
+       echo "  <li onclick=\"hl('0');\" class=\"current\"><a href=\"#\">Pre</a>\n".
+         "    <div class=\"trick\" id=\"trick0\">\n";
+
+       /* 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 */
+      }
+    /* end output pre-game trick */
+
     /* check if user need to give more cards back */
     if( ($myparty=='re' || $myparty=='contra') && count($mycards)>12)
       {
@@ -1184,93 +1211,10 @@ switch($mystatus)
       {
        echo "  <li onclick=\"hl('0');\" class=\"current\"><a href=\"#\">Pre</a>\n".
             "    <div class=\"trick\" id=\"trick0\">\n";
-       /* get information so show the cards that have been handed over in a poverty game */
-       $partnerpos1 = 0;
-       $povertypos1 = 0;
-       $partnerpos2 = 0;
-       $povertypos2 = 0;
-       if($mygametype == 'poverty' || $mygametype=='dpoverty')
-         {
-           /* who has poverty */
-           for($mypos=1;$mypos<5;$mypos++)
-             {
-               $usersick = DB_get_sickness_by_pos_and_gameid($mypos,$gameid);
-               if($usersick == 'poverty')
-                 if($povertypos1)
-                   $povertypos2 = $mypos;
-                 else
-                   $povertypos1 = $mypos;
-             }
-           /* get hash and cards for all */
-           $povertyhash1 = DB_get_hash_from_game_and_pos($gameid,$povertypos1);
-           $partnerhash1 = DB_get_partner_hash_by_hash($povertyhash1);
-
-           $povertycards1 = DB_get_exchanged_cards($povertyhash1);
-           $partnercards1 = DB_get_exchanged_cards($partnerhash1);
 
-           $partnerpos1 = DB_get_pos_by_hash($partnerhash1);
-           if($povertypos2)
-             {
-               $povertyhash2 = DB_get_hash_from_game_and_pos($gameid,$povertypos2);
-               $partnerhash2 = DB_get_partner_hash_by_hash($povertyhash2);
-
-               $povertycards2 = DB_get_exchanged_cards($povertyhash2);
-               $partnercards2 = DB_get_exchanged_cards($partnerhash2);
-
-               $partnerpos2 = DB_get_pos_by_hash($partnerhash2);
-             }
-         }
-
-       $show = 1;
-       for($mypos=1;$mypos<5;$mypos++)
-         {
-           $usersick = DB_get_sickness_by_pos_and_gameid($mypos,$gameid);
-           if($usersick!=NULL ||
-              $mypos==$povertypos1 || $mypos==$partnerpos1 ||
-              $mypos==$povertypos2 || $mypos==$partnerpos2 )
-             {
-               echo "      <div class=\"vorbehalt".($mypos-1)."\"> Vorbehalt <br />";
-               if($show)
-                 echo " $usersick <br />";
-               if($mypos==$partnerpos1)
-                 {
-                   foreach($partnercards1 as $card)
-                     if($povertyhash1 == $me || $partnerhash1 == $me || $mystatus=='gameover')
-                       display_card($card,$PREF['cardset']);
-                     else
-                       display_card(0,$PREF['cardset']);
-                 }
-               else if($mypos==$povertypos1)
-                 {
-                   foreach($povertycards1 as $card)
-                     if($povertyhash1 == $me || $partnerhash1 == $me || $mystatus=='gameover')
-                       display_card($card,$PREF['cardset']);
-                     else
-                       display_card(0,$PREF['cardset']);
-                 }
-               else if($mypos==$povertypos2)
-                 {
-                   foreach($povertycards2 as $card)
-                     if($povertyhash2 == $me || $partnerhash2 == $me || $mystatus=='gameover')
-                       display_card($card,$PREF['cardset']);
-                     else
-                       display_card(0,$PREF['cardset']);
-                 }
-               else if($mypos==$partnerpos2)
-                 {
-                   foreach($partnercards2 as $card)
-                     if($povertyhash2 == $me || $partnerhash2 == $me || $mystatus=='gameover')
-                       display_card($card,$PREF['cardset']);
-                     else
-                       display_card(0,$PREF['cardset']);
-                 }
-
-               echo  " </div>\n";
+       /* get information so show the cards that have been handed over in a poverty game */
+       output_exchanged_cards();
 
-               if($mygametype == $usersick)
-                 $show = 0;
-             }
-         }
        echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
       }