--- deliantra/Deliantra-Client/Client.xs	2009/12/21 23:52:34	1.296
+++ deliantra/Deliantra-Client/Client.xs	2010/04/22 11:18:04	1.303
@@ -43,6 +43,8 @@
 /* work around os x broken headers */
 #ifdef __MACOSX__
 typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
 #endif
 
 #define PANGO_ENABLE_BACKEND
@@ -99,7 +101,6 @@
 
 #define TEXID_SPEECH 1
 #define TEXID_NOFACE 2
-#define TEXID_HIDDEN 3
 
 static AV *texture_av;
 
@@ -931,6 +932,9 @@
 #define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
 #include "glfunc.h"
 #undef GL_FUNC
+
+            if (!gl.ActiveTexture  ) gl.ActiveTexture   = gl.ActiveTextureARB;
+            if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
           }
 }
 	OUTPUT:
@@ -1025,6 +1029,19 @@
           }
 }
 
+char *
+SDL_AudioDriverName ()
+        CODE:
+{
+        char buf [256];
+        if (!SDL_AudioDriverName (buf, sizeof (buf)))
+          XSRETURN_UNDEF;
+
+        RETVAL = buf;
+}
+	OUTPUT:
+        RETVAL
+
 int
 Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
   	POSTCALL:
@@ -1673,9 +1690,9 @@
 	PROTOTYPE: @
 	CODE:
 {
-        glEnable (GL_TEXTURE_2D);
         glEnable (GL_BLEND);
-        glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+        glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+        glEnable (GL_TEXTURE_2D);
         glBindTexture (GL_TEXTURE_2D, name1);
 
         glColor3f (intensity, intensity, intensity);
@@ -1700,7 +1717,7 @@
 
             /* rgb == rgb(glcolor) */
             glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
-            glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
+            glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
             glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
 
             /* alpha = interpolate t0, t1 by env_alpha */
@@ -2143,7 +2160,7 @@
         rc_t *rc    = rc_alloc ();
         rc_t *rc_ov = rc_alloc ();
         rc_key_t key;
-        rc_array_t *arr, *arr_hidden;
+        rc_array_t *arr;
 
         pl_tex.name = 0;
 
@@ -2191,9 +2208,6 @@
         glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
         glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
 
-        key.texname = self->tex [TEXID_HIDDEN].name;
-        arr_hidden = rc_array (rc_ov, &key);
-
         for (z = 0; z <= 2; z++)
           {
             memset (smooth_level, 0, sizeof (smooth_level));
@@ -2799,9 +2813,15 @@
             RETVAL = Mix_GroupOldest (-1);
 
             if (RETVAL < 0)
-              XSRETURN_UNDEF;
+              {
+                // happens sometimes, maybe it just stopped playing(?)
+                RETVAL = Mix_GroupAvailable (-1);
 
-            Mix_HaltChannel (RETVAL);
+                if (RETVAL < 0)
+                  XSRETURN_UNDEF;
+              }
+            else
+              Mix_HaltChannel (RETVAL);
           }
 
         Mix_UnregisterAllEffects (RETVAL);
@@ -2871,6 +2891,18 @@
 
 PROTOTYPES: DISABLE
 
+void
+decoders ()
+	PPCODE:
+#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
+        int i, num = Mix_GetNumChunkDecoders ();
+        EXTEND (SP, num);
+        for (i = 0; i < num; ++i)
+          PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
+#else
+        XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
+#endif
+
 DC::MixChunk
 new (SV *class, DC::RW rwops)
 	CODE:
@@ -2912,6 +2944,18 @@
 
 MODULE = Deliantra::Client	PACKAGE = DC::MixMusic
 
+void
+decoders ()
+	PPCODE:
+#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
+        int i, num = Mix_GetNumMusicDecoders ();
+        EXTEND (SP, num);
+        for (i = 0; i < num; ++i)
+          PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
+#else
+        XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
+#endif
+
 int
 volume (int volume = -1)
 	PROTOTYPE: ;$
@@ -2932,6 +2976,13 @@
 	CODE:
         Mix_HaltMusic ();
 
+int
+playing ()
+	CODE:
+        RETVAL = Mix_PlayingMusic ();
+	OUTPUT:
+        RETVAL
+
 DC::MixMusic
 new (SV *class, DC::RW rwops)
 	CODE: