BUGFIX: error in card dealing routine

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

diff --git a/include/output.php b/include/output.php
index f694c5b4d833a896e3251f32bd849682ce43b8c8..395e4ec812cc8a171b09c2db9e4802cdfa99c973 100644 (file)
--- a/include/output.php
+++ b/include/output.php
@@ -28,6 +28,10 @@ function output_ask_for_new_game($playerA,$playerB,$playerC,$playerD,$oldgameid)
 
 function output_form_for_new_game($names)
 {
+  $copy_names = $names; /* local copy, so that we can delete names from it
+                        * after we selected them to make sure that each name
+                        * only shows up once
+                        */
 ?>
   <form action="index.php?action=new" method="post">
     <h2> Select players (Remember: you need to be one of the players) </h2>
@@ -35,13 +39,30 @@ function output_form_for_new_game($names)
    <div class="table">
      <img class="table" src="pics/table.png" alt="table" />
 <?php
-    /* ask for player names */
-    $i=0;
+
+  /* ask player for names */
+
+  $i=0;
+
+  /* delete players name, since he will be on position D anyway */
+  unset($copy_names[array_search($_SESSION["name"],$copy_names)]);
+
+  srand((float) microtime() * 10000000);
   foreach( array("PlayerA","PlayerB","PlayerC","PlayerD") as $player)
     {
-      srand((float) microtime() * 10000000);
-      $randkey = array_rand($names);
-      $rand = $names[$randkey];
+      /* pick 3 names at random and put the players name on position D*/
+      if($i<3)
+       {
+         $randkey = array_rand($copy_names);
+         $rand = $copy_names[$randkey];
+         /* delete this name from the list of possible names */
+         unset($copy_names[$randkey]);
+       }
+      else
+       {
+         $rand = $_SESSION["name"];
+       }
+
       echo  "     <div class=\"table".$i."\">\n";
       $i++;
       echo "       <select name=\"$player\" size=\"1\">  \n";
@@ -296,7 +317,7 @@ function output_footer()
 
   echo "</div>\n\n";
   echo "<div class=\"footer\">\n";
-  echo "  <p class=\"left\"> copyright 2006-2008 Arun Persaud, Lance Thornton <br />\n".
+  echo "  <p class=\"left\"> copyright 2006-2009 Arun Persaud, Lance Thornton(graphics), Jeff Zerger(database support) <br />\n".
     "  Verwendung der [deutschen] Kartenbilder mit Genehmigung <br />der Spielkartenfabrik Altenburg GmbH,(c) ASS Altenburger <br />\n".
     "  - ASS Altenburger Spielkarten - Spielkartenfabrik Altenburg GmbH <br />\n".
     "  a Carta Mundi Company Email: info@spielkarten.com Internet: www.spielkarten.com</p>\n";
@@ -419,4 +440,20 @@ function output_user_notes($userid,$gameid,$userstatus)
   return;
 }
 
+function output_robotproof($i)
+{
+  switch($i)
+    {
+    case 0:
+      return "6*7=";
+    case 1:
+      return "5*7=";
+    case 2:
+      return "4*7=";
+    case 3:
+      return "3*7=";
+    case 4:
+      return "2*7=";
+    }
+}
 ?>
\ No newline at end of file