--- deliantra/server/include/map.h	2007/02/07 02:04:46	1.65
+++ deliantra/server/include/map.h	2007/04/14 07:23:00	1.73
@@ -67,7 +67,6 @@
 #define GET_MAP_LIGHT(M,X,Y)         (M)->at((X),(Y)).light
 #define GET_MAP_OB(M,X,Y)            (M)->at((X),(Y)).bot
 #define GET_MAP_TOP(M,X,Y)           (M)->at((X),(Y)).top
-#define GET_MAP_FACE(M,X,Y,L)        (M)->at((X),(Y)).faces[L]
 #define GET_MAP_FACE_OBJ(M,X,Y,L)    (M)->at((X),(Y)).faces_obj[L]
 #define GET_MAP_MOVE_BLOCK(M,X,Y)    (M)->at((X),(Y)).move_block
 #define GET_MAP_MOVE_SLOW(M,X,Y)     (M)->at((X),(Y)).move_slow
@@ -120,7 +119,6 @@
 struct mapspace
 {
   object *bot, *top;            /* lowest/highest object on this space */
-  facetile *faces[MAP_LAYERS];  /* faces for the 3 layers */
   object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */
   uint8 flags_;                 /* flags about this space (see the P_ values above) */
   sint8 light;                  /* How much light this space provides */
@@ -156,8 +154,8 @@
     return 0;
   }
 
-  // return the item volume on this mapspace in kg/m³
-  uint64 volume ();
+  // return the item volume on this mapspace in cm³
+  uint64 volume () const;
 };
 
 /*
@@ -168,7 +166,8 @@
 struct region : zero_initialised
 {
   shstr ACC (RW, name);                   /* Shortend name of the region as maps refer to it */
-  region *ACC (RW, parent);        /* 
+  shstr ACC (RW, match);                  // a perl regex that matches map paths
+  region *ACC (RW, parent);        	  /* 
                                            * Pointer to the region that is a parent of the current
                                            * region, if a value isn't defined in the current region
                                            * we traverse this series of pointers until it is.
@@ -179,13 +178,14 @@
   shstr ACC (RW, jailmap);                /*where a player that is arrested in this region should be imprisoned. */
   int ACC (RW, index);
   uint32 ACC (RW, counter);               /* A generic counter for holding temporary data. */
-  sint16 ACC (RW, jailx), ACC (RW, jaily);          /* The coodinates in jailmap to which the player should be sent. */
-  bool ACC (RW, fallback);               /* whether, in the event of a region not existing,
+  sint16 ACC (RW, jailx), ACC (RW, jaily);/* The coodinates in jailmap to which the player should be sent. */
+  bool ACC (RW, fallback);                /* whether, in the event of a region not existing,
                                            * this should be the one we fall back on as the default */
 
   static region *default_region ();
   static region *find (const char *name);
   static region *find_fuzzy (const char *name);
+  static region *read (object_thawer &f);
 };
 
 typedef object_vector<region, &region::index> regionvec;
@@ -193,7 +193,7 @@
 extern regionvec regions;
 
 #define for_all_regions(var)			\
-  for (int _i = 0; _i < regions.size (); ++_i)	\
+  for (unsigned _i = 0; _i < regions.size (); ++_i)	\
     declvar (region *, var, regions [_i])
 
 struct shopitems : zero_initialised
@@ -277,6 +277,8 @@
   shstr ACC (RW, tile_path[4]);      /* path to adjoining maps */
   maptile *ACC (RW, tile_map[4]);   /* Next map, linked list */
   shstr ACC (RW, path);   /* Filename of the map */
+  int ACC (RW, max_nrof);                 // maximum nrof of any single item on a mapspace
+  uint64 ACC (RW, max_volume);            // maximum volume for all items on a mapspace
 
   MTH void activate ();
   MTH void deactivate ();
@@ -354,9 +356,10 @@
   void make_map_floor (char **layout, char *floorstyle, random_map_params *RP);
   bool generate_random_map (random_map_params *RP);
 
-  static maptile *find_sync (const char *path, maptile *original = 0);//PERL
-  // async prefetch
   static maptile *find_async (const char *path, maptile *original = 0);//PERL
+  static maptile *find_sync (const char *path, maptile *original = 0);//PERL
+  static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
+  MTH object *pick_random_object () const;
 
   mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
   mapspace       &at (uint32 x, uint32 y)       { return spaces [x * height + y]; }