--- deliantra/Deliantra-Client/Client.xs	2006/08/18 01:01:00	1.141
+++ deliantra/Deliantra-Client/Client.xs	2006/08/18 02:25:12	1.144
@@ -171,8 +171,9 @@
 } maptex;
 
 typedef struct {
-  int16_t darkness;
+  uint16_t darkness;
   mapface face[3];
+  uint8_t stat_hp;
 } mapcell;
 
 typedef struct {
@@ -310,7 +311,7 @@
               if (x >= row->c1)
                 break;
 
-              row->col[x - row->c0].darkness = -1;
+              row->col[x - row->c0].darkness = 0;
             }
       }
 }
@@ -1281,40 +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;
                   }
 
+                //TODO: don't trust server data to be in-range(!)
+
                 if (flags & 8)
                   {
-                   fprintf (stderr, "oi\n");//D
                     if (extmap)
                       {
                         uint8_t ext, cmd;
 
                         do
                           {
-
                             ext = *data++;
-                            cmd = ext & 0x7f;
-
-                            fprintf (stderr, "extcmd = %x\n", ext);//D
+                            cmd = ext & 0x3f;
 
                             if (ext < 4)
-                              cell->darkness = 255 - ext * 64;
+                              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 = flags & 8 ? *data++ : 255;
+                      cell->darkness = *data++ + 1;
                   }
 
-                //TODO: don't trust server data to be in-range(!)
-
                 if (flags & 4)
                   {
                     cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
@@ -1331,7 +1333,7 @@
                   }
               }
             else
-              cell->darkness = -1;
+              cell->darkness = 0;
           }
 }
 
@@ -1468,6 +1470,33 @@
 
         glDisable (GL_TEXTURE_2D);
         glDisable (GL_BLEND);
+
+        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)
+                      {
+                        glColor3ub (0,  0,  0);
+                        glRectf (px + 1, py + 1, px + 31, py + 4);
+
+                        glColor3ub (0, 255, 0);
+                        glBegin (GL_LINES);
+                        glVertex2f (px + 2, py + 2.5f);
+                        glVertex2f (px + 29.f - cell->stat_hp * (28.f / 255.f), py + 2.5f);
+                        glEnd ();
+                      }
+                  }
+            }
 }
 
 void
@@ -1557,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;
                   }
             }
 
@@ -1684,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++)
                           {