--- deliantra/Deliantra-Client/Client.xs	2010/05/02 21:22:20	1.305
+++ deliantra/Deliantra-Client/Client.xs	2010/10/14 00:02:39	1.306
@@ -102,6 +102,25 @@
 #define TEXID_SPEECH 1
 #define TEXID_NOFACE 2
 
+static char *
+fast_sv_grow (SV *sv, STRLEN need)
+{
+  STRLEN len  = SvLEN (sv);
+  STRLEN want = SvCUR (sv) + need;
+
+  if (expect_false (len < want))
+    {
+      do
+        len *= 2;
+      while (len < want);
+
+      sv_grow (sv, len);
+    }
+
+  SvCUR_set (sv, want);
+  return SvEND (sv) - need;
+}
+
 static AV *texture_av;
 
 static struct
@@ -465,6 +484,12 @@
 }
 
 static unsigned int
+div255 (unsigned int n)
+{
+  return (n + (n >> 8)) >> 8;
+}
+
+static unsigned int
 minpot (unsigned int n)
 {
   if (!n)
@@ -2117,7 +2142,7 @@
 
             for (x = x0; x < x1; x++)
               {
-                int r = 32, g = 32, b = 32, a = 192;
+                unsigned int r = 32, g = 32, b = 32, a = 192;
 
                 if (row && row->c0 <= x && x < row->c1)
                   {
@@ -2129,10 +2154,10 @@
                         int a0 = 255 - tex.a;
                         int a1 = tex.a;
 
-                        r = (r * a0 + tex.r * a1) / 255;
-                        g = (g * a0 + tex.g * a1) / 255;
-                        b = (b * a0 + tex.b * a1) / 255;
-                        a = (a * a0 + tex.a * a1) / 255;
+                        r = div255 (r * a0 + tex.r * a1);
+                        g = div255 (g * a0 + tex.g * a1);
+                        b = div255 (b * a0 + tex.b * a1);
+                        a = div255 (a * a0 + tex.a * a1);
                       }
                   }
 
@@ -2149,7 +2174,7 @@
         RETVAL
 
 void
-draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
+draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
 	CODE:
 {
         int x, y, z;
@@ -2243,8 +2268,8 @@
                                 arr = rc_array (rc, &key);
                               }
 
-                            px = (x + 1) * T - tex.w;
-                            py = (y + 1) * T - tex.h;
+                            px = (x + 1) * Th - tex.w;
+                            py = (y + 1) * Tw - tex.h;
 
                             if (expect_false (cell->player == player) && expect_false (z == 2))
                               {
@@ -2307,16 +2332,16 @@
                                 rc_key_t key_ov = key;
                                 maptex tex = self->tex [TEXID_SPEECH];
                                 rc_array_t *arr;
-                                int px = x * T + T * 2 / 32;
-                                int py = y * T - T * 6 / 32;
+                                int px = x * Tw + Tw * 2 / 32;
+                                int py = y * Th - Th * 6 / 32;
 
                                 key_ov.texname = tex.name;
                                 arr = rc_array (rc_ov, &key_ov);
 
-                                rc_t2f_v3f (arr, 0    , 0    , px    , py    , 0);
-                                rc_t2f_v3f (arr, 0    , tex.t, px    , py + T, 0);
-                                rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
-                                rc_t2f_v3f (arr, tex.s, 0    , px + T, py    , 0);
+                                rc_t2f_v3f (arr, 0    , 0    , px     , py     , 0);
+                                rc_t2f_v3f (arr, 0    , tex.t, px     , py + Th, 0);
+                                rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
+                                rc_t2f_v3f (arr, tex.s, 0    , px + Tw, py     , 0);
                               }
                           }
                       }
@@ -2353,8 +2378,8 @@
                                   && level > smooth_max [skey->x][skey->y])
                                 {
                                   maptex tex = self->tex [skey->tile];
-                                  int px = (((int)skey->x) - 1) * T;
-                                  int py = (((int)skey->y) - 1) * T;
+                                  int px = (((int)skey->x) - 1) * Tw;
+                                  int py = (((int)skey->y) - 1) * Th;
                                   int border = bits & 15;
                                   int corner = (bits >> 8) & ~(bits >> 4) & 15;
                                   float dx = tex.s * .0625f; // 16 images/row
@@ -2377,20 +2402,20 @@
                                         {
                                           float ox = border * dx;
 
-                                          glTexCoord2f (ox     , 0.f     ); glVertex2i (px    , py    );
-                                          glTexCoord2f (ox     , dy      ); glVertex2i (px    , py + T);
-                                          glTexCoord2f (ox + dx, dy      ); glVertex2i (px + T, py + T);
-                                          glTexCoord2f (ox + dx, 0.f     ); glVertex2i (px + T, py    );
+                                          glTexCoord2f (ox     , 0.f     ); glVertex2i (px     , py     );
+                                          glTexCoord2f (ox     , dy      ); glVertex2i (px     , py + Th);
+                                          glTexCoord2f (ox + dx, dy      ); glVertex2i (px + Tw, py + Th);
+                                          glTexCoord2f (ox + dx, 0.f     ); glVertex2i (px + Tw, py     );
                                         }
 
                                       if (corner)
                                         {
                                           float ox = corner * dx;
 
-                                          glTexCoord2f (ox     , dy      ); glVertex2i (px    , py    );
-                                          glTexCoord2f (ox     , dy * 2.f); glVertex2i (px    , py + T);
-                                          glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
-                                          glTexCoord2f (ox + dx, dy      ); glVertex2i (px + T, py    );
+                                          glTexCoord2f (ox     , dy      ); glVertex2i (px     , py     );
+                                          glTexCoord2f (ox     , dy * 2.f); glVertex2i (px     , py + Th);
+                                          glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
+                                          glTexCoord2f (ox + dx, dy      ); glVertex2i (px + Tw, py     );
                                         }
                                     }
                                 }
@@ -2441,8 +2466,8 @@
                   {
                     mapcell *cell = row->col + (x + mx - row->c0);
 
-                    int px = x * T;
-                    int py = y * T;
+                    int px = x * Tw;
+                    int py = y * Th;
 
                     if (expect_false (cell->player == player))
                       {
@@ -2452,8 +2477,8 @@
 
                     if (cell->stat_hp)
                       {
-                        int width = cell->stat_width * T;
-                        int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
+                        int width = cell->stat_width * Tw;
+                        int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
 
                         glColor3ub (0,  0,  0);
                         glRectf (px + 1, py - thick - 2,