--- deliantra/Deliantra-Client/Client.xs	2006/08/18 02:23:39	1.143
+++ deliantra/Deliantra-Client/Client.xs	2006/09/21 00:16:42	1.155
@@ -171,9 +171,10 @@
 } maptex;
 
 typedef struct {
-  uint16_t darkness;
+  uint32_t player;
   mapface face[3];
-  uint8_t stat_hp;
+  uint16_t darkness;
+  uint8_t stat_width, stat_hp, flags;
 } mapcell;
 
 typedef struct {
@@ -296,6 +297,7 @@
 {
   int x, y;
   maprow *row;
+  mapcell *cell;
 
   for (y = y0; y < y0 + h; y++)
     if (y >= 0)
@@ -311,7 +313,12 @@
               if (x >= row->c1)
                 break;
 
-              row->col[x - row->c0].darkness = 0;
+              cell = row->col + x - row->c0;
+              
+              cell->darkness = 0;
+              cell->stat_hp  = 0;
+              cell->flags    = 0;
+              cell->player   = 0;
             }
       }
 }
@@ -1241,14 +1248,14 @@
 	CODE:
 {
         if (dx > 0)
-          map_blank (self, self->x, self->y, dx - 1, self->h);
+          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, 1 - dx, self->h);
+          map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
 
         if (dy > 0)
-          map_blank (self, self->x, self->y, self->w, dy - 1);
+          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, 1 - dy);
+          map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
 
 	self->ox += dx; self->x += dx;
 	self->oy += dy; self->y += dy;
@@ -1271,7 +1278,7 @@
         mapcell *cell;
         int x, y, flags;
 
-        while (data < data_end)
+        while (data < data_end - 1)
           {
             flags = (data [0] << 8) + data [1]; data += 2;
             
@@ -1284,11 +1291,8 @@
               {
                 if (!cell->darkness)
                   {
+                    memset (cell, 0, sizeof (*cell));
                     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(!)
@@ -1302,17 +1306,36 @@
                         do
                           {
                             ext = *data++;
-                            cmd = ext & 0x7f;
+                            cmd = ext & 0x3f;
 
-                            if (ext < 4)
+                            if (cmd < 4)
                               cell->darkness = 255 - ext * 64 + 1;
-                            else if (ext == 5) // health
-                              cell->stat_hp = *data++;
+                            else if (cmd == 5) // health
+                              {
+                                cell->stat_width = 1;
+                                cell->stat_hp = *data++;
+                              }
+                            else if (cmd == 6) // monster width
+                              cell->stat_width = *data++ + 1;
+                            else if (cmd == 0x47) // monster width
+                              {
+                                if (*data == 4)
+                                  ; // decode player tag
+
+                                data += *data + 1;
+                              }
+                            else if (cmd == 8) // cell flags
+                              cell->flags = *data++;
+                            else if (ext & 0x40) // unknown, multibyte => skip
+                              data += *data + 1;
+                            else
+                              data++;
                           }
-                        while (cmd & 0x80);
+                        while (ext & 0x80);
                       }
                     else
                       cell->darkness = *data++ + 1;
+
                   }
 
                 if (flags & 4)
@@ -1441,18 +1464,16 @@
 
                       face = cell->face [z];
 
-                      if (face)
+                      if (face && face < self->texs)
                         {
                           maptex tex = self->tex [face];
-
                           int px = (x + 1) * 32 - tex.w;
                           int py = (y + 1) * 32 - tex.h;
 
                           if (last_name != tex.name)
                             {
                               glEnd ();
-                              last_name = tex.name;
-                              glBindTexture (GL_TEXTURE_2D, last_name);
+                              glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
                               glBegin (GL_QUADS);
                             }
 
@@ -1461,6 +1482,25 @@
                           glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
                           glTexCoord2f (tex.s, 0    ); glVertex2f (px + tex.w, py        );
                         }
+
+                      if (cell->flags && z == 2)
+                        {
+                          if (cell->flags & 1)
+                            {
+                              maptex tex = self->tex [1];
+                              int px = (x + 1) * 32 - tex.w + 2;
+                              int py = (y + 1) * 32 - tex.h - 6;
+
+                              glEnd ();
+                              glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
+                              glBegin (GL_QUADS);
+
+                              glTexCoord2f (0    , 0    ); glVertex2f (px        , py        );
+                              glTexCoord2f (0    , tex.t); glVertex2f (px        , py + tex.h);
+                              glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
+                              glTexCoord2f (tex.s, 0    ); glVertex2f (px + tex.w, py        );
+                            }
+                        }
                     }
               }
 
@@ -1469,6 +1509,7 @@
         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)
             {
@@ -1484,14 +1525,17 @@
 
                     if (cell->stat_hp)
                       {
+                        int width = cell->stat_width * 32;
+                        int thick = sh / 28 + 1 + cell->stat_width;
+
                         glColor3ub (0,  0,  0);
-                        glRectf (px + 1, py + 1, px + 31, py + 4);
+                        glRectf (px + 1, py - thick - 2,
+                                 px + width - 1, py);
 
-                        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 ();
+                        glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
+                        glRectf (px + 2,
+                                 py - thick - 1,
+                                 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
                       }
                   }
             }