--- deliantra/Deliantra-Client/Client.xs	2007/08/13 14:15:09	1.227
+++ deliantra/Deliantra-Client/Client.xs	2007/08/19 15:57:40	1.232
@@ -205,7 +205,7 @@
 typedef uint16_t faceid;
 
 typedef struct {
-  int name;
+  GLuint name;
   int w, h;
   float s, t;
   uint8_t r, g, b, a;
@@ -717,7 +717,7 @@
           {
             av_clear (texture_av);
 
-            SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
+            SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT");
 #define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
 #include "glfunc.h"
 #undef GL_FUNC
@@ -2551,6 +2551,12 @@
 	const_iv (GL_LUMINANCE_ALPHA),
 	const_iv (GL_FLOAT),
 	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
+        const_iv (GL_COMPRESSED_ALPHA_ARB),
+        const_iv (GL_COMPRESSED_LUMINANCE_ARB),
+        const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
+        const_iv (GL_COMPRESSED_INTENSITY_ARB),
+        const_iv (GL_COMPRESSED_RGB_ARB),
+        const_iv (GL_COMPRESSED_RGBA_ARB),
 	const_iv (GL_COMPILE),
 	const_iv (GL_PROXY_TEXTURE_1D),
 	const_iv (GL_PROXY_TEXTURE_2D),
@@ -2599,6 +2605,7 @@
         const_iv (GL_LINE_SMOOTH_HINT),
         const_iv (GL_POLYGON_SMOOTH_HINT),
         const_iv (GL_GENERATE_MIPMAP_HINT),
+        const_iv (GL_TEXTURE_COMPRESSION_HINT),
         const_iv (GL_FASTEST),
         const_iv (GL_DONT_CARE),
         const_iv (GL_NICEST),
@@ -2616,6 +2623,12 @@
   AvREAL_off (texture_av);
 }
 
+void
+disable_GL_EXT_blend_func_separate ()
+	CODE:
+        gl.BlendFuncSeparate    = 0;
+        gl.BlendFuncSeparateEXT = 0;
+
 char *
 gl_vendor ()
 	CODE:
@@ -2856,8 +2869,7 @@
         SV *draw_y_sv = GvSV (draw_y_gv);
         SV *draw_w_sv = GvSV (draw_w_gv);
         SV *draw_h_sv = GvSV (draw_h_gv);
-        SV *hover;
-        double draw_x, draw_y, draw_w, draw_h;
+        double draw_x, draw_y;
 
         if (!SvROK (self))
           croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
@@ -2895,7 +2907,7 @@
 
             if (svp && SvTRUE (*svp))
               {
-                glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);
+                glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
                 glEnable (GL_BLEND);
                 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
                 glBegin (GL_QUADS);