--- deliantra/server/include/map.h	2007/03/11 02:12:44	1.71
+++ deliantra/server/include/map.h	2007/04/19 16:23:47	1.74
@@ -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 */
-  faceidx 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 */
@@ -160,43 +158,6 @@
   uint64 volume () const;
 };
 
-/*
- * Each map is in a given region of the game world and links to a region definiton, so
- * they have to appear here in the headers, before the mapdef
- */
-INTERFACE_CLASS (region)
-struct region : zero_initialised
-{
-  shstr ACC (RW, name);                   /* Shortend name of the region as maps refer to it */
-  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.
-                                           */
-  shstr ACC (RW, longname);               /* Official title of the region, this might be defined
-                                           * to be the same as name*/
-  shstr ACC (RW, msg);                    /* the description of the region */
-  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,
-                                           * 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;
-
-extern regionvec regions;
-
-#define for_all_regions(var)			\
-  for (unsigned _i = 0; _i < regions.size (); ++_i)	\
-    declvar (region *, var, regions [_i])
-
 struct shopitems : zero_initialised
 {
   const char *name;             /* name of the item in question, null if it is the default item */