--- deliantra/Deliantra-Client/Client.xs	2006/05/19 03:49:47	1.85
+++ deliantra/Deliantra-Client/Client.xs	2006/05/19 23:18:40	1.88
@@ -472,6 +472,9 @@
             }
 }
 
+char *
+SDL_GetError ()
+
 int
 SDL_SetVideoMode (int w, int h, int fullscreen)
 	CODE:
@@ -672,19 +675,17 @@
 void
 error (char *message)
 	CODE:
-#ifdef _WIN32
-        MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
-#else
         fprintf (stderr, "ERROR: %s\n", message);
+#ifdef _WIN32
+        MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
 #endif
 
 void
 fatal (char *message)
 	CODE:
-#ifdef _WIN32
-        MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
-#else
         fprintf (stderr, "FATAL: %s\n", message);
+#ifdef _WIN32
+        MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
 #endif
         exit (1);
 
@@ -717,6 +718,9 @@
 CFClient::Layout
 new (SV *class, int rgba = 0)
 	CODE:
+#if _WIN32
+        rgba = 0;//D
+#endif
         New (0, RETVAL, 1, struct cf_layout);
 
         RETVAL->pl          = pango_layout_new (rgba ? cairo_context : ft2_context);
@@ -906,6 +910,18 @@
                 {
                   uint32_t rgba = *p;
                   rgba = (rgba >> 24) | (rgba << 8);
+#if 0
+#ifdef _WIN32
+                  {//D
+                    uint8_t r = rgba >> 24;
+                    uint8_t g = rgba >> 16;
+                    uint8_t b = rgba >>  8;
+                    uint8_t a = rgba >>  0;
+
+                    rgba = (rgba & 0xffffff00) | a;
+                  }
+#endif
+#endif
                   rgba = SDL_SwapBE32 (rgba);
                   *p++ = rgba;
                 }
@@ -972,6 +988,8 @@
           {
             glEnable (GL_BLEND);
             glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+            glEnable (GL_ALPHA_TEST);
+            glAlphaFunc (GL_GREATER, 0.01f);
           }
 
         glBindTexture (GL_TEXTURE_2D, name);
@@ -990,7 +1008,10 @@
         glEnd ();
 
         if (ix)
-          glDisable (GL_BLEND);
+          {
+            glDisable (GL_ALPHA_TEST);
+            glDisable (GL_BLEND);
+          }
 }
 
 MODULE = CFClient	PACKAGE = CFClient::Map
@@ -1523,7 +1544,9 @@
 	const_iv (GL_RGBA),
 	const_iv (GL_UNSIGNED_BYTE),
 	const_iv (GL_ALPHA),
+	const_iv (GL_INTENSITY),
 	const_iv (GL_LUMINANCE),
+	const_iv (GL_LUMINANCE_ALPHA),
 	const_iv (GL_FLOAT),
 	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
 	const_iv (GL_COMPILE),