--- deliantra/Deliantra-Client/Client.xs	2007/07/29 18:56:02	1.214
+++ deliantra/Deliantra-Client/Client.xs	2007/07/31 00:50:04	1.215
@@ -2271,6 +2271,28 @@
 
 PROTOTYPES: DISABLE
 
+CFPlus::Channel
+find ()
+	CODE:
+{
+        RETVAL = Mix_GroupAvailable (-1);
+
+        if (RETVAL < 0)
+          {
+            RETVAL = Mix_GroupOldest (-1);
+
+            if (RETVAL < 0)
+              XSRETURN_UNDEF;
+
+            Mix_HaltChannel (RETVAL);
+          }
+
+        Mix_UnregisterAllEffects (RETVAL);
+        Mix_Volume (RETVAL, 128);
+}
+	OUTPUT:
+        RETVAL
+
 void
 halt (CFPlus::Channel self)
 	CODE:
@@ -2342,10 +2364,20 @@
         RETVAL
 
 CFPlus::Channel
-play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
+play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)
 	CODE:
+{
         RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
-        Mix_UnregisterAllEffects (RETVAL);
+
+        if (RETVAL < 0)
+          XSRETURN_UNDEF;
+
+        if (channel < 0)
+          {
+            Mix_UnregisterAllEffects (RETVAL);
+            Mix_Volume (RETVAL, 128);
+          }
+}
 	OUTPUT:
         RETVAL