new sort function; should sorrt correctly for solos,etc

2 files changed, 21 insertions, 1 deletions

diff --git a/functions.php b/functions.php
index 221bea8..cecc63c 100644
--- a/functions.php
+++ b/functions.php
@@ -523,4 +523,24 @@ 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;
+  }
+
+  $compare = create_function("$a, $b", "return pos_array($a,$ALL)-pos_array($b,$ALL);");
+
+  usort ( $cards, $compare );
+
+  return;
+}
+
+
 ?>
\ No newline at end of file
diff --git a/index.php b/index.php
index f8bb305..ef047be 100644
--- a/index.php
+++ b/index.php
@@ -667,7 +667,7 @@ else if(myisset("me"))
 	  }
 	
 	$mycards = DB_get_hand($me);
-	sort($mycards);
+	mysort($mycards,$gametype);
 	echo "<div class=\"mycards\">\n";
 	
 	if($myturn && !myisset("card"))