NEW FEATURE: use a better random generator

[e-DoKo.git] / functions.php

diff --git a/functions.php b/functions.php
index 7ee180e946b9d2f8c248b9062e428b1d866ac61d..2d2277b4da4feeebc143ac06695d6ba6a26e7dfc 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -283,72 +283,6 @@ function count_trump($cards)
   return $trump;
 }
 
-function card_value($card)
-{
-  switch($card)
-    {
-    case 3:     /* clubes */    
-    case 4:                     
-    case 5:     /* spades */    
-    case 6:                     
-    case 7:     /* hearts */    
-    case 8:                     
-    case 9:     /* diamonds */  
-    case 10:                     
-      return 3;
-    case 11:    /* clubes */    
-    case 12:                    
-    case 13:   /* spades */     
-    case 14:                    
-    case 15:   /* hearts */     
-    case 16:                    
-    case 17:   /* diamonds */   
-    case 18:
-      return 2;                         
-    case 19:    /* diamonds */ 
-    case 20:                  
-    case 27:    /* clubs */    
-    case 28:                  
-    case 35:    /* spades */   
-    case 36:                  
-    case 43:    /* hearts */   
-    case 44:                   
-      return 11;
-    case 1:      /* heart */
-    case 2:
-    case 21:    /* diamonds */    
-    case 22:
-    case 29:    /* clubs */
-    case 30:
-    case 37:    /* spades */
-    case 38:
-      return 10;
-    case 23:    /* diamonds */ 
-    case 24:                  
-    case 31:   /* clubs */    
-    case 32:                  
-    case 39:   /* spades */   
-    case 40:                  
-    case 45:   /* hearts */   
-    case 46:                  
-      return 4;
-    case 25:    /* diamonds */   
-    case 26:                  
-    case 33:   /* clubs */    
-    case 34:                  
-    case 41:   /* spades */   
-    case 42:                  
-    case 47:   /* hearts */   
-    case 48:                  
-      return 0;
-    default:
-      myerror("something went wrong, please contact $ADMIN_NAME at $ADMIN_EMAIL. ErrorCode: 2 - $card<br>");
-      echo "something went wrong, please contact $ADMIN_NAME at $ADMIN_EMAIL. ErrorCode: 2 - $card<br>";
-      return 0;
-    }
-}
-
-
 function  create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD)
 {
   global $debug;
@@ -375,7 +309,7 @@ function  create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD)
       /* 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));
+      $userstr = "'".implode("','",array($useridA,$useridB,$useridC,$useridD))."'";
       $randomnumbers = DB_get_unused_randomnumbers($userstr);
       $randomnumbers = explode(":",$randomnumbers);
       
@@ -386,7 +320,14 @@ function  create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD)
       for($i=0;$i<48;$i++)
        $r[$i]=$i+1;
       
-      shuffle($r); 
+      /* shuffle using a better random generator than the standard one */
+      for ($i = 0; $i <48; $i++)
+       {
+         $j = @mt_rand(0, $i);
+         $tmp = $r[$i];
+         $r[$i] = $r[$j];
+         $r[$j] = $tmp;
+       }
     };
 
   return $r;