--- deliantra/Deliantra-Client/Client.xs	2006/05/26 18:28:23	1.97
+++ deliantra/Deliantra-Client/Client.xs	2006/05/29 02:11:03	1.99
@@ -969,7 +969,6 @@
 	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
 	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
         int name = SvIV (*hv_fetch (hv, "name", 4, 1));
-        int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
 
         if (items < 5)
           {
@@ -987,12 +986,6 @@
 
         glBindTexture (GL_TEXTURE_2D, name);
 
-        if (wrap_mode)
-          {
-             glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-             glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-          }
-
         glBegin (GL_QUADS);
         glTexCoord2f (0, 0); glVertex2f (x    , y    );
         glTexCoord2f (0, t); glVertex2f (x    , y + h);
@@ -1082,8 +1075,11 @@
        // somewhat hackish, but for textures that require it, it really
        // improves the look, and most others don't suffer.
        glBindTexture (GL_TEXTURE_2D, name);
-       glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-       glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+       //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+       //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+       // use uglier nearest interpolation because linear suffers
+       // from transparent color bleeding and ugly wrapping effects.
+       glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 }
 
 int
@@ -1564,8 +1560,9 @@
 	const_iv (GL_TEXTURE_ENV_MODE),
 	const_iv (GL_TEXTURE_WRAP_S),
 	const_iv (GL_TEXTURE_WRAP_T),
-	const_iv (GL_CLAMP),
 	const_iv (GL_REPEAT),
+	const_iv (GL_CLAMP),
+	const_iv (GL_CLAMP_TO_EDGE),
 	const_iv (GL_NEAREST),
 	const_iv (GL_LINEAR),
         const_iv (GL_NEAREST_MIPMAP_NEAREST),