--- deliantra/server/random_maps/random_map.h 2010/07/03 02:19:10 1.40 +++ deliantra/server/random_maps/random_map.h 2010/07/03 03:09:27 1.41 @@ -51,7 +51,6 @@ int symmetry_used; HV *hv; - void hv_clone (); // replaces the hv by a clone'd copy (%new_hv = { %hv }) shstr_tmp as_shstr () const; @@ -75,6 +74,7 @@ int Ysize; random_map_params (); + random_map_params (random_map_params *RP); random_map_params (HV *hv); ~random_map_params (); }; @@ -88,6 +88,7 @@ LAYOUT_SNAKE, LAYOUT_SQUARE_SPIRAL, LAYOUT_CAVE, + LAYOUT_MULTIPLE, NROFLAYOUTS, }; @@ -158,7 +159,11 @@ layout (int w, int h); layout (layout ©); - layout (layout &orig, int x1, int y1, int x2, int y2); // reference rect in other layout + + // reference rect in other layout - will not keep the data alive, + // so never swap with it's orig, or free the orig when in use. + layout (layout &orig, int x1, int y1, int x2, int y2); + ~layout (); operator cell **() const