--- deliantra/Deliantra-Client/Client.xs	2006/04/13 00:25:28	1.28
+++ deliantra/Deliantra-Client/Client.xs	2006/04/13 01:55:38	1.29
@@ -20,6 +20,11 @@
 
 #include <inttypes.h>
 
+#define FOW_DARKNESS 32
+
+#define MAP_EXTEND_X  32
+#define MAP_EXTEND_Y 512
+
 static PangoContext *context;
 static PangoFontMap *fontmap;
 
@@ -58,13 +63,12 @@
 }
 
 typedef struct {
+  int16_t darkness;
   uint16_t face[3];
-  uint8_t darkness;
-  uint8_t padding;
 } mapcell;
 
 typedef struct {
-  uint32_t cols;
+  uint32_t c0, c1;
   mapcell *col;
 } maprow;
 
@@ -77,6 +81,29 @@
   maprow *row;
 } *CFClient__Map;
 
+static void
+map_blank (CFClient__Map self, int x0, int y0, int w, int h)
+{
+  int x, y;
+
+  for (y = y0; y < y0 + h; y++)
+    {
+      if (y >= self->rows)
+        break;
+
+      maprow *row = self->row + y;
+
+      for (x = x0; x < x0 + w; x++)
+        if (x >= row->c0)
+          {
+            if (x >= row->c1)
+              break;
+
+            row->col[x].darkness = -1;
+          }
+    }
+}
+
 MODULE = CFClient	PACKAGE = CFClient
 
 PROTOTYPES: ENABLE
@@ -336,11 +363,11 @@
         RETVAL->y = 0;
         RETVAL->w = map_width;
         RETVAL->h = map_height;
-        RETVAL->faces = 0;
-        RETVAL->face = 0;
-
+        RETVAL->faces = 1;
+        Newz (0, RETVAL->face, 1, GLint);
         RETVAL->rows = 0;
         RETVAL->row = 0;
+        printf ("new map %d,%d\n", map_width, map_height);//D
 	OUTPUT:
         RETVAL
 
@@ -350,17 +377,162 @@
 {
 	int r, c;
 
+        printf ("detroy map\n");//D
         Safefree (self->face);
+
         for (r = 0; r < self->rows; r++)
+          Safefree (self->row[r].col);
+
+        Safefree (self->row);
+        Safefree (self);
+}
+
+void
+set_face (CFClient::Map self, int facenum, int face)
+	CODE:
+{
+        while (self->faces < facenum)
           {
-            maprow *row = self->row + r;
-            if (!row)
-              continue;
+           printf ("setface %d (%d) = %d\n",facenum, self->faces, face);//D
+            Renew (self->face, self->faces * 2, GLint);
+            Zero (self->face + self->faces, self->faces, GLint);
+            self->faces *= 2;
+          }
 
-            Safefree (row->col);
+        self->face [facenum] = face;
+}
+
+void
+scroll (CFClient::Map self, int dx, int dy)
+	CODE:
+{
+	printf ("map_scroll %d,%d\n", dx, dy);//D
+        if (dx > 0)
+          map_blank (self, self->x, self->y, dx - 1, self->h);
+        else if (dx < 0)
+          map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);
+
+        if (dy > 0)
+          map_blank (self, self->x, self->y, self->w, dy - 1);
+        else if (dy < 0)
+          map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);
+
+	self->x += dx;
+	self->y += dy;
+
+        while (self->y < 0)
+          {
+            maprow *row;
+
+            New (0, row, self->rows + MAP_EXTEND_Y, maprow);
+            Move (self->row, row + MAP_EXTEND_Y, self->rows, maprow);
+            Zero (row, MAP_EXTEND_Y, maprow);
+             
+            self->rows += MAP_EXTEND_Y;
+            self->y    += MAP_EXTEND_Y;
+            self->row  = row;
           }
 
-        Safefree (self->row);
-        Safefree (self);
+        if (self->x < 0)
+          {
+            int y;
+            for (y = 0; y < self->rows; y++)
+              {
+                self->row[y].c0 += self->x;
+                self->row[y].c1 += self->x;
+              }
+
+            self->x = 0;
+          }
+}
+
+void
+map1a_update (CFClient::Map self, SV *data_)
+	CODE:
+{
+        uint8_t *data = (uint8_t *)SvPVbytes_nolen (data_);
+        uint8_t *data_end = (uint8_t *)SvEND (data_) + 1;
+	
+        while (data < data_end)
+          {
+            int flags = (data [0] << 8) + data [1]; data += 2;
+            int x = ((flags >> 10) & 63) + self->x;
+            int y = ((flags >>  4) & 63) + self->y;
+
+            while (y >= self->rows)
+              {
+                Renew (self->row, self->rows + MAP_EXTEND_Y, maprow);
+                Zero (self->row + self->rows, MAP_EXTEND_Y, maprow);
+
+                self->rows += MAP_EXTEND_Y;
+              }
+
+            assert (y < self->rows);//D
+
+            maprow *row = self->row + y;
+
+            if (!row->col)
+              {
+                Newz (0, row->col, MAP_EXTEND_X, mapcell);
+                row->c0 = self->x - MAP_EXTEND_X / 4;
+                row->c1 = row->c0 + MAP_EXTEND_X;
+              }
+
+            if (row->c0 > x)
+              {
+                int extend = row->c0 - x + MAP_EXTEND_X;
+                mapcell *col;
+
+                New (0, col, row->c1 - row->c0 + extend, mapcell);
+                Move (row->col, col + extend, row->c1 - row->c0, mapcell);
+                Zero (col, extend, mapcell);
+                 
+                row->col = col;
+                row->c0 -= extend;
+              }
+            else if (x >= row->c1)
+              {
+                int extend = x - row->c1 + MAP_EXTEND_X;
+
+                Renew (row->col, row->c1 - row->c0 + extend, mapcell);
+                Zero (row->col + row->c1 - row->c0, extend, mapcell);
+
+                row->c1 += extend;
+              }
+
+            assert (x >= row->c0);//D
+            assert (x < row->c1);//D
+            mapcell *cell = row->col + (x - row->c0);
+
+            if (flags & 15)
+              {
+                if (cell->darkness < 0)
+                  {
+                    cell->darkness = 0;
+                    cell->face [0] = 0;
+                    cell->face [1] = 0;
+                    cell->face [2] = 0;
+                  }
+                
+                cell->darkness = flags & 8 ? *data++ : 255;
+
+                if (flags & 4)
+                  {
+                    cell->face [0] = (data [0] << 8) + data [1]; data += 2;
+                  }
+
+                if (flags & 2)
+                  {
+                    cell->face [1] = (data [0] << 8) + data [1]; data += 2;
+                  }
+
+                if (flags & 1)
+                  {
+                    cell->face [2] = (data [0] << 8) + data [1]; data += 2;
+                  }
+              }
+            else
+              cell->darkness = -1;
+          }
 }