--- deliantra/Deliantra-Client/Client.xs	2006/07/05 03:01:01	1.128
+++ deliantra/Deliantra-Client/Client.xs	2006/07/12 17:20:04	1.129
@@ -465,6 +465,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)
@@ -626,7 +633,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 +685,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 +773,7 @@
 MODULE = CFClient	PACKAGE = CFClient::Layout
 
 void
-clear_font_cache ()
+reset_glyph_cache ()
 	CODE:
         tc_clear ();
 
@@ -874,6 +881,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))));
               }