Merge branch 'dealing-reuse'

[e-DoKo.git] / functions.php

diff --git a/functions.php b/functions.php
index 418591dd2d04537a3cb9582a9ee3e745f5871fa8..3a650a2d94ca3dadb31f418595a962b84d528719 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -9,7 +9,6 @@ function mymail($To,$Subject,$message,$header="")
       $message = str_replace("\n","<br />\n",$message);
       $message = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",
                      "<a href=\"\\0\">\\0</a>", $message);
-      //$message = ereg_replace("(http.*)[ <>]","<a href=\"\\1\">\\1 </a>",$message);
       
       echo "<br />To: $To<br />";
       if($header != "") 
@@ -423,7 +422,7 @@ function card_value($card)
 }
 
 
-function  create_array_of_random_numbers()
+function  create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD)
 {
   global $debug;
 
@@ -446,10 +445,21 @@ function  create_array_of_random_numbers()
     }
   else
     {
+      /* check if we can find a game were non of the player was involved and return 
+       * cards insted 
+       */
+      $userstr = implode(",",array($useridA,$useridB,$useridC,$useridD));
+      $randomnumbers = DB_get_unused_randomnumbers($userstr);
+      $randomnumbers = explode(":",$randomnumbers);
+      
+      if(sizeof($randomnumbers)==48)
+       return $randomnumbers;
+      
+      /* need to create new numbers */
       for($i=0;$i<48;$i++)
        $r[$i]=$i+1;
       
-      shuffle($r);
+      shuffle($r); 
     };
 
   return $r;
@@ -656,7 +666,7 @@ function can_call($what,$hash)
   $gameid   = DB_get_gameid_by_hash($hash);
   $gametype = DB_get_gametype_by_gameid($gameid);
 
-  $NRcards  = count(DB_get_hand($me));
+  $NRcards  = count(DB_get_hand($hash));
   
   $NRallcards = 0;
   for ($i=1;$i<5;$i++)
@@ -677,11 +687,11 @@ function can_call($what,$hash)
   switch ($RULES["call"])
     {
     case "1st-own-card":
-      if( 4-($what/30) >= 12 - $NRcards + $offset)
+      if( 4-($what/30) >= 12 - ($NRcards + $offset))
        return 1;
       break;
     case "5th-card":
-      if( 27+4*($what/30)) <= $NRallcards + $offset*4)
+      if( 27+4*($what/30) <= $NRallcards + $offset*4)
        return 1;
       break;
     case "9-cards":