--- deliantra/Deliantra-Client/Client.xs	2006/08/14 01:21:01	1.138
+++ deliantra/Deliantra-Client/Client.xs	2006/08/18 03:19:58	1.145
@@ -146,12 +146,19 @@
 static void
 layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
 {
-  pango_layout_get_pixel_size (self->pl, w, h);
+  PangoRectangle rect;
 
-  if (!*w) *w = 1;
-  if (!*h) *h = 1;
+  // get_pixel_* wrongly rounds down
+  pango_layout_get_extents (self->pl, 0, &rect);
 
-  *w = (*w + 3) & ~3;
+  rect.width  = (rect.width  + PANGO_SCALE - 1) / PANGO_SCALE;
+  rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
+
+  if (!rect.width)  rect.width  = 1;
+  if (!rect.height) rect.height = 1;
+
+  *w = rect.width;
+  *h = rect.height;
 }
 
 typedef uint16_t mapface;
@@ -164,8 +171,9 @@
 } maptex;
 
 typedef struct {
-  int16_t darkness;
+  uint16_t darkness;
   mapface face[3];
+  uint8_t stat_hp;
 } mapcell;
 
 typedef struct {
@@ -303,7 +311,7 @@
               if (x >= row->c1)
                 break;
 
-              row->col[x - row->c0].darkness = -1;
+              row->col[x - row->c0].darkness = 0;
             }
       }
 }
@@ -1255,7 +1263,7 @@
 }
 
 void
-map1a_update (CFPlus::Map self, SV *data_)
+map1a_update (CFPlus::Map self, SV *data_, int extmap)
 	CODE:
 {
         uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
@@ -1274,18 +1282,41 @@
 
             if (flags & 15)
               {
-                if (cell->darkness < 0)
+                if (!cell->darkness)
                   {
-                    cell->darkness = 0;
+                    cell->darkness = 256;
                     cell->face [0] = 0;
                     cell->face [1] = 0;
                     cell->face [2] = 0;
+                    cell->stat_hp = 0;
                   }
 
-                cell->darkness = flags & 8 ? *data++ : 255;
-
                 //TODO: don't trust server data to be in-range(!)
 
+                if (flags & 8)
+                  {
+                    if (extmap)
+                      {
+                        uint8_t ext, cmd;
+
+                        do
+                          {
+                            ext = *data++;
+                            cmd = ext & 0x3f;
+
+                            if (ext < 4)
+                              cell->darkness = 255 - ext * 64 + 1;
+                            else if (ext == 5) // health
+                              cell->stat_hp = *data++;
+                            else if (ext & 0x40) // unknown, multibyte => skip
+                              data += *data + 1;
+                          }
+                        while (cmd & 0x80);
+                      }
+                    else
+                      cell->darkness = *data++ + 1;
+                  }
+
                 if (flags & 4)
                   {
                     cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
@@ -1302,7 +1333,7 @@
                   }
               }
             else
-              cell->darkness = -1;
+              cell->darkness = 0;
           }
 }
 
@@ -1412,7 +1443,7 @@
 
                       face = cell->face [z];
 
-                      if (face)
+                      if (face && face < self->texs)
                         {
                           maptex tex = self->tex [face];
 
@@ -1439,6 +1470,33 @@
 
         glDisable (GL_TEXTURE_2D);
         glDisable (GL_BLEND);
+
+        // top layer: overlays such as the health bar
+        for (y = 0; y < sh; y++)
+          if (0 <= y + vy && y + vy < self->rows)
+            {
+              maprow *row = self->row + (y + vy);
+
+              for (x = 0; x < sw; x++)
+                if (row->c0 <= x + vx && x + vx < row->c1)
+                  {
+                    mapcell *cell = row->col + (x + vx - row->c0);
+
+                    int px = x * 32;
+                    int py = y * 32;
+
+                    if (cell->stat_hp)
+                      {
+                        int width = sh / 28 + 1;
+
+                        glColor3ub (0,  0,  0);
+                        glRectf (px + 1, py, px + 31, py + width + 2);
+
+                        glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
+                        glRectf (px + 2, py + 1, px + 30 - cell->stat_hp * 28 / 255, py + width + 1);
+                      }
+                  }
+            }
 }
 
 void
@@ -1528,9 +1586,9 @@
                   {
                     mapcell *cell = row->col + (x + vx - row->c0);
 
-                    darkness[y * sw4 + x] = cell->darkness < 0
-                      ? 255 - FOW_DARKNESS
-                      : 255 - cell->darkness;
+                    darkness[y * sw4 + x] = cell->darkness
+                      ? 255 - (cell->darkness - 1)
+                      : 255 - FOW_DARKNESS;
                   }
             }
 
@@ -1655,9 +1713,9 @@
                     if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
                     if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
 
-                    if (cell->darkness <= 0)
+                    if (cell->darkness == 0)
                       {
-                        cell->darkness = -1;
+                        cell->darkness = 0;
 
                         for (z = 0; z <= 2; z++)
                           {