--- deliantra/server/include/map.h	2006/09/16 22:06:17	1.20
+++ deliantra/server/include/map.h	2006/12/03 02:04:57	1.23
@@ -22,7 +22,7 @@
 */
 
 /*
- * The mapstruct is allocated each time a new map is opened.
+ * The maptile is allocated each time a new map is opened.
  * It contains pointers (very indirectly) to all objects on the map.
  */
 
@@ -276,10 +276,10 @@
  * (or even through the macros), but doing so will completely
  * break map tiling.
  */
-ACC_CLASS (mapstruct)
-struct mapstruct:zero_initialised, attachable < mapstruct >
+ACC_CLASS (maptile)
+struct maptile : zero_initialised, attachable<maptile>
 {
-  struct mapstruct *ACC (RW, next);        /* Next map, linked list */
+  maptile *ACC (RW, next);        /* Next map, linked list */
   char *ACC (RO, tmpname); /* Name of temporary file */
   char *ACC (RO, name);    /* Name of map as given by its creator */
   struct region *ACC (RW, region); /* What jurisdiction in the game world this map is ruled by 
@@ -297,7 +297,7 @@
   bool ACC (RW, nosmooth); /* if set the content of this map has smoothlevel=0 forced */
   sint32 ACC (RW, timeout);        /* swapout is set to this */
   sint32 ACC (RW, swap_time);      /* When it reaches 0, the map will be swapped out */
-  sint16 ACC (RW, players);        /* How many plares are on this level right now */
+  sint16 ACC (RW, players);        /* How many players are on this level right now */
   uint32 ACC (RW, in_memory);      /* If not true, the map has been freed and must
                                     * be loaded before used.  The map,omap and map_ob
                                     * arrays will be allocated when the map is loaded */
@@ -325,8 +325,11 @@
   char *ACC (RO, msg);     /* Message map creator may have left */
   char *ACC (RO, maplore); /* Map lore information */
   char *tile_path[4];      /* path to adjoining maps */
-  struct mapstruct *tile_map[4];   /* Next map, linked list */
+  maptile *tile_map[4];   /* Next map, linked list */
   char ACC (RW, path)[HUGE_BUF];   /* Filename of the map */
+
+  maptile ();
+  void allocate ();
 };
 
 /* This is used by get_rangevector to determine where the other
@@ -348,3 +351,4 @@
 };
 
 #endif
+