--- deliantra/server/server/cfperl.xs	2010/06/30 01:57:54	1.388
+++ deliantra/server/server/cfperl.xs	2010/07/02 15:03:57	1.389
@@ -86,6 +86,7 @@
    *stash_cf_party_wrap,
    *stash_cf_region_wrap,
    *stash_cf_living_wrap,
+   *stash_cf_layout_wrap,
    *stash_ext_map_world;
 
 static SV
@@ -541,6 +542,7 @@
 static inline SV *to_sv (partylist *    v) { return newSVptr (v, stash_cf_party_wrap); }
 static inline SV *to_sv (living *       v) { return newSVptr (v, stash_cf_living_wrap); }
 static inline SV *to_sv (mapspace *     v) { return newSVptr (v, stash_cf_mapspace_wrap); }
+static inline SV *to_sv (layout *       v) { return newSVptr (v, stash_cf_layout_wrap); }
 
 static inline SV *to_sv (object &       v) { return to_sv (&v); }
 static inline SV *to_sv (living &       v) { return to_sv (&v); }
@@ -596,6 +598,7 @@
 static inline void sv_to (SV *sv, partylist *        &v) { v = (partylist *)              SvPTR_ornull (sv, "cf::party"); }
 static inline void sv_to (SV *sv, living *           &v) { v = (living *)                 SvPTR_ornull (sv, "cf::living"); }
 static inline void sv_to (SV *sv, mapspace *         &v) { v = (mapspace *)               SvPTR_ornull (sv, "cf::mapspace"); }
+static inline void sv_to (SV *sv, layout *           &v) { v = (layout *)                 SvPTR_ornull (sv, "cf::layout"); }
 static inline void sv_to (SV *sv, object_freezer *   &v) { v = (object_freezer *)         SvPTR_ornull (sv, "cf::object::freezer"); }
 static inline void sv_to (SV *sv, object_thawer *    &v) { v = (object_thawer  *)         SvPTR_ornull (sv, "cf::object::thawer" ); }
 
@@ -1399,6 +1402,7 @@
   stash_cf_party_wrap         = gv_stashpv ("cf::party::wrap" , 1);
   stash_cf_region_wrap        = gv_stashpv ("cf::region::wrap", 1);
   stash_cf_living_wrap        = gv_stashpv ("cf::living::wrap", 1);
+  stash_cf_layout_wrap        = gv_stashpv ("cf::layout::wrap", 1);
   stash_ext_map_world         = gv_stashpv ("ext::map_world"  , 1);
 
   sv_now        = get_sv ("cf::NOW"       , 1); SvUPGRADE (sv_now       , SVt_NV);
@@ -2921,3 +2925,7 @@
             self->skip ();
           }
 
+MODULE = cf        PACKAGE = cf::layout
+
+INCLUDE: $PERL $srcdir/genacc layout $srcdir/../random_maps/random_map.h |
+