[ViewVC] Diff of: cvs/deliantra/server/random

Comparing deliantra/server/random_maps/layout.C (file contents):
Revision 1.13 by root, Sat Jul 3 01:52:52 2010 UTC vs.
Revision 1.14 by root, Sat Jul 3 02:19:10 2010 UTC

   this->h = h;
   // we store the layout in a single contiguous memory layout
   // first part consists of pointers to each column, followed
   // by the actual columns (not rows!)
-  int size = (sizeof (cell *) + sizeof (cell) * h) * w;
+  size = (sizeof (cell *) + sizeof (cell) * h) * w;
   data = (cell **)salloc<char> (size);
   cell *p = (cell *)(data + w);
-  for (int x = w; x--; )
+  for (int x = 0; x < w; ++x)
     data [x] = p + x * h;
 }
 layout::layout (int w, int h)
 {
   alloc (copy.w, copy.h);
   memcpy (data [0], copy.data [0], sizeof (cell) * h * w);
 }
+layout::layout (layout &orig, int x1, int y1, int x2, int y2)
+{
+  w = x2 - x1;
+  h = y2 - y1;
+  // we only allocate space for the pointers
+  size = sizeof (cell *) * w;
+  data = (cell **)salloc<char> (size);
+  // and now we point back into the original layout
+  for (int x = 0; x < w; ++x)
+    data [x] = orig.data [x + x1] + y1;
+}
 layout::~layout ()
 {
-  int size = (sizeof (cell *) + sizeof (cell) * h) * w;
   sfree ((char *)data, size);
 }
 void
 layout::fill (char fill)

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines