--- deliantra/Deliantra-Client/Client.xs	2006/07/05 03:01:01	1.128
+++ deliantra/Deliantra-Client/Client.xs	2006/07/13 01:54:18	1.131
@@ -1,4 +1,5 @@
 #ifdef _WIN32
+# define WIN32_LEAN_AND_MEAN
 # define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
 # include <malloc.h>
 # include <windows.h>
@@ -9,6 +10,10 @@
 #include "perl.h"
 #include "XSUB.h"
 
+#ifdef _WIN32
+# undef pipe
+#endif
+
 #include <math.h>
 #include <string.h>
 #include <stdio.h>
@@ -42,8 +47,6 @@
  typedef   signed int   int32_t;
 #endif
 
-#include "glext.h"
-
 #define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
 
 #define FOW_DARKNESS 32
@@ -465,6 +468,13 @@
     newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
 }
 
+int
+in_destruct ()
+	CODE:
+        RETVAL = PL_main_cv == Nullcv;
+        OUTPUT:
+        RETVAL
+
 NV floor (NV x)
 
 NV ceil (NV x)
@@ -504,6 +514,8 @@
         SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
 
         SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
+        SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
+        SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
 
         SDL_EnableUNICODE (1);
         SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
@@ -626,7 +638,7 @@
 void
 add_font (char *file)
 	CODE:
-        FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
+        FcConfigAppFontAddFile (0, (const FcChar8 *)file);
 
 void
 load_image_inline (SV *image_)
@@ -678,15 +690,15 @@
 
         assert (surface2->pitch == surface2->w * 4);
 
-        EXTEND (SP, 5);
+        SDL_LockSurface (surface2);
+        EXTEND (SP, 6);
         PUSHs (sv_2mortal (newSViv (surface2->w)));
         PUSHs (sv_2mortal (newSViv (surface2->h)));
-        SDL_LockSurface (surface2);
         PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
-        SDL_UnlockSurface (surface2);
         PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
         PUSHs (sv_2mortal (newSViv (GL_RGBA)));
         PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
+        SDL_UnlockSurface (surface2);
 
         SDL_FreeSurface (surface);
         SDL_FreeSurface (surface2);
@@ -766,7 +778,7 @@
 MODULE = CFClient	PACKAGE = CFClient::Layout
 
 void
-clear_font_cache ()
+reset_glyph_cache ()
 	CODE:
         tc_clear ();
 
@@ -874,6 +886,7 @@
                 PangoRectangle extents;
                 pango_layout_iter_get_run_extents (iter, 0, &extents);
 
+                EXTEND (SP, 2);
                 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
                 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
               }
@@ -1908,10 +1921,7 @@
             b *= a;
           }
         // microsoft visual "c" rounds instead of truncating...
-        glColor4ub (MIN ((int)(r * 256.f), 255),
-                    MIN ((int)(g * 256.f), 255),
-                    MIN ((int)(b * 256.f), 255),
-                    MIN ((int)(a * 256.f), 255));
+        glColor4f (r, g, b, a);
 
 void glInterleavedArrays (int format, int stride, char *data)