--- deliantra/Deliantra-Client/Client.xs	2006/08/14 03:04:17	1.139
+++ deliantra/Deliantra-Client/Client.xs	2006/08/18 01:27:15	1.142
@@ -157,8 +157,6 @@
   if (!rect.width)  rect.width  = 1;
   if (!rect.height) rect.height = 1;
 
-  rect.width = (rect.width + 3) & ~3;
-
   *w = rect.width;
   *h = rect.height;
 }
@@ -173,8 +171,9 @@
 } maptex;
 
 typedef struct {
-  int16_t darkness;
+  uint16_t darkness;
   mapface face[3];
+  uint8_t stat_hp;
 } mapcell;
 
 typedef struct {
@@ -312,7 +311,7 @@
               if (x >= row->c1)
                 break;
 
-              row->col[x - row->c0].darkness = -1;
+              row->col[x - row->c0].darkness = 0;
             }
       }
 }
@@ -1264,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_);
@@ -1283,18 +1282,38 @@
 
             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->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 & 0x7f;
+
+                            if (ext < 4)
+                              cell->darkness = 255 - ext * 64 + 1;
+                            else if (ext == 5) // health
+                              cell->stat_hp = *data++;
+                          }
+                        while (cmd & 0x80);
+                      }
+                    else
+                      cell->darkness = *data++ + 1;
+                  }
+
                 if (flags & 4)
                   {
                     cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
@@ -1311,7 +1330,7 @@
                   }
               }
             else
-              cell->darkness = -1;
+              cell->darkness = 0;
           }
 }
 
@@ -1537,9 +1556,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;
                   }
             }
 
@@ -1664,9 +1683,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 <= 1)
                       {
-                        cell->darkness = -1;
+                        cell->darkness = 0;
 
                         for (z = 0; z <= 2; z++)
                           {