--- deliantra/Deliantra-Client/Client.xs	2007/04/10 11:12:53	1.178
+++ deliantra/Deliantra-Client/Client.xs	2007/04/27 21:27:51	1.192
@@ -58,6 +58,8 @@
 # define PARACHUTE 0
 #endif
 
+static AV *texture_av;
+
 static struct
 {
 #define GL_FUNC(ptr,name) ptr name;
@@ -65,7 +67,8 @@
 #undef GL_FUNC
 } gl;
 
-static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
+static void
+gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
 {
   if (gl.BlendFuncSeparate)
     gl.BlendFuncSeparate (sa, da, saa, daa);
@@ -75,6 +78,30 @@
     glBlendFunc (sa, da);
 }
 
+static GLuint
+gen_texture ()
+{
+  GLuint name;
+
+  if (AvFILL (texture_av) >= 0)
+    name = (GLuint)(size_t)av_pop (texture_av);
+  else
+    glGenTextures (1, &name);
+
+  return name;
+}
+
+static void
+del_texture (GLuint name)
+{
+  /* make a half-assed attempt at returning the memory used by the texture */
+  /* textures are frequently being reused by cfplus anyway */
+  /*glBindTexture (GL_TEXTURE_2D, name);*/
+  /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
+  av_push (texture_av, (SV *)(size_t)name);
+  glDeleteTextures (1, &name);
+}
+
 #include "texcache.c"
 
 #include "pango-font.c"
@@ -347,7 +374,7 @@
 static void
 smooth_or_bits (HV *hv, smooth_key *key, IV bits)
 {
-  SV **sv = hv_fetch (hv, (char *)key, sizeof (key), 1);
+  SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
 
   if (SvIOK (*sv))
     SvIV_set (*sv, SvIVX (*sv) | bits);
@@ -616,10 +643,13 @@
         );
         if (RETVAL)
           {
+            av_clear (texture_av);
+
             SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
 #           define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
 #           include "glfunc.h"
 #           undef GL_FUNC
+
           }
 	OUTPUT:
         RETVAL
@@ -703,9 +733,7 @@
 void
 lowdelay (int fd, int val = 1)
 	CODE:
-#ifndef _WIN32
-        setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
-#endif
+        setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
 
 void
 win32_proxy_info ()
@@ -1395,12 +1423,12 @@
         if (dx > 0)
           map_blank (self, self->x, self->y, dx, self->h);
         else if (dx < 0)
-          map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
+          map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
 
         if (dy > 0)
           map_blank (self, self->x, self->y, self->w, dy);
         else if (dy < 0)
-          map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
+          map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
 
 	self->ox += dx; self->x += dx;
 	self->oy += dy; self->y += dy;
@@ -1464,8 +1492,8 @@
                               cell->stat_width = *data++ + 1;
                             else if (cmd == 0x47)
                               {
-                                if (*data == 8)
-                                  ; // decode player uuid
+                                if (*data == 4)
+                                  ; // decode player count
 
                                 data += *data + 1;
                               }
@@ -1685,12 +1713,24 @@
                                 // add bits to current tile and all neighbours. skey.x|y is
                                 // shifted +1|+1 so we always stay positive.
 
+                                // bits is ___n cccc CCCC bbbb
+                                // n  do not draw borders&corners
+                                // c  draw these corners, but...
+                                // C  ... not these
+                                // b  draw these borders
+
+                                // borders: 1 ┃·  2 ━━  4 ·┃  8 ··
+                                //            ┃·    ··    ·┃    ━━
+                                
+                                // corners: 1 ┛·  2 ·┗  4 ··  8 ··
+                                //            ··    ··    ·┏    ┓·
+
                                 // full tile
                                 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
 
                                 // borders
-                                skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031);
-                                skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092);
+                                skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
+                                skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
                                 skey.x = x    ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
                                 skey.x = x + 1; skey.y = y    ; smooth_or_bits (smooth, &skey, 0x00c8);
 
@@ -1704,7 +1744,7 @@
                       }
               }
 
-            // go through all smoothlevels, lowest to highest, then draw
+            // go through all smoothlevels, lowest to highest, then draw.
             // this is basically counting sort
             {
               int w, b;
@@ -1725,15 +1765,9 @@
                               smooth_key *skey = (smooth_key *)HeKEY (he);
                               IV bits = SvIVX (HeVAL (he));
 
-                              // bits is ___n cccc CCCC bbbb
-                              // n  do not draw borders&corners
-                              // c  draw these corners, but...
-                              // C  ... not these
-                              // b  draw these borders
-
                               if (!(bits & 0x1000)
                                   && skey->level == level
-                                  && level >= smooth_max [skey->x][skey->y])
+                                  && level > smooth_max [skey->x][skey->y])
                                 {
                                   maptex tex = self->tex [skey->tile];
                                   int px = (((int)skey->x) - 1) * T;
@@ -2208,6 +2242,9 @@
     
   for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
     newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
+
+  texture_av = newAV ();
+  AvREAL_off (texture_av);
 }
 
 char *
@@ -2366,21 +2403,14 @@
 
 int glGenTexture ()
         CODE:
-{
-        GLuint name;
-        glGenTextures (1, &name);
-        RETVAL = name;
-}
+        RETVAL = gen_texture ();
 	OUTPUT:
         RETVAL
 
 void glDeleteTexture (int name)
 	CODE:
-{
-        GLuint name_ = name;
-        glDeleteTextures (1, &name_);
-}
-        
+        del_texture (name);
+
 int glGenList ()
 	CODE:
         RETVAL = glGenLists (1);