--- deliantra/Deliantra-Client/Client.xs	2009/12/22 00:46:05	1.298
+++ deliantra/Deliantra-Client/Client.xs	2010/05/02 21:22:20	1.305
@@ -932,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:
@@ -1026,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:
@@ -1099,6 +1115,9 @@
         RETVAL
 
 void
+IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
+
+void
 load_image_inline (SV *image_)
 	ALIAS:
         load_image_file = 1
@@ -1674,9 +1693,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);
@@ -1701,7 +1720,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 */
@@ -2797,9 +2816,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);
@@ -2869,6 +2894,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:
@@ -2910,6 +2947,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: ;$
@@ -2930,6 +2979,13 @@
 	CODE:
         Mix_HaltMusic ();
 
+int
+playing ()
+	CODE:
+        RETVAL = Mix_PlayingMusic ();
+	OUTPUT:
+        RETVAL
+
 DC::MixMusic
 new (SV *class, DC::RW rwops)
 	CODE:
@@ -3133,6 +3189,8 @@
 
 void glFinish ()
 
+void glFlush ()
+
 void glClear (int mask)
 
 void glClearColor (float r, float g, float b, float a = 1.0)