fixed the new sorting algorithm

diff --git a/functions.php b/functions.php
index cecc63c5df74b79598cbf5f3a1e164b6a9f416b6..45416a786c9a5d00317c6c861d8213704847a96c 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -525,22 +525,18 @@ function set_gametype($gametype)
 
 function mysort($cards,$gametype)
 {
-  global $TRUMP,$DIAMONDS,$HEARTS,$CLUBS,$SPADES;
-    
-  switch($gametype) {
-  case normal:
-  case trump:
-  default:
-    $ALL = array_merge($TRUMP,$DIAMONDS,$CLUBS,$HEARTS,$SPADES,$DIAMONDS);
-    break;
-  }
+  usort ( $cards, "sort_comp" );
+  return $cards;
+}
 
-  $compare = create_function("$a, $b", "return pos_array($a,$ALL)-pos_array($b,$ALL);");
+function sort_comp($a,$b)
+{
+  global $TRUMP,$DIAMONDS,$HEARTS,$CLUBS,$SPADES;
 
-  usort ( $cards, $compare );
+  $ALL = array();
+  $ALL = array_merge($TRUMP,$DIAMONDS,$CLUBS,$HEARTS,$SPADES,$DIAMONDS);
 
-  return;
+  return pos_array($a,$ALL)-pos_array($b,$ALL);
 }
 
-
 ?>
\ No newline at end of file

diff --git a/index.php b/index.php
index ef047be0f0983f169174417b78b240a810ca9d07..6353f34280feafae3a4a378312bcfc9ebf79a617 100644 (file)
--- a/index.php
+++ b/index.php
@@ -667,7 +667,7 @@ else if(myisset("me"))
          }
        
        $mycards = DB_get_hand($me);
-       mysort($mycards,$gametype);
+       $mycards = mysort($mycards,$gametype);
        echo "<div class=\"mycards\">\n";
        
        if($myturn && !myisset("card"))