--- deliantra/server/include/map.h	2006/08/29 09:27:58	1.14
+++ deliantra/server/include/map.h	2006/09/08 12:56:43	1.18
@@ -262,9 +262,10 @@
 };
 
 
-struct shopitems {
-    const char *name;     /* name of the item in question, null if it is the default item */
-    const char *name_pl;  /* plural name */
+struct shopitems : zero_initialised
+{
+    const char *name;    /* name of the item in question, null if it is the default item */
+    const char *name_pl; /* plural name */
     int typenum;    /* itemtype number we need to match 0 if it is the default price*/
     sint8 strength; /* the degree of specialisation the shop has in this item, 
                      * as a percentage from -100 to 100 */
@@ -279,9 +280,7 @@
  * (or even through the macros), but doing so will completely
  * break map tiling.
  */
-struct mapstruct : attachable<mapstruct> {
-    static data_type get_dt () { return DT_MAP; }
-
+struct mapstruct : zero_initialised, attachable<mapstruct> {
     struct mapstruct *next;	/* Next map, linked list */
     char *tmpname;	/* Name of temporary file */
     char *name;		/* Name of map as given by its creator */
@@ -296,7 +295,6 @@
                                  * players entering/exiting map
                                  */
     uint32 unique:1;	/* if set, this is a per player unique map */
-    uint32 safe_map:1;	/* if set, this map doesn't allow using magic or harmful stuff in any way */
     uint32 templatemap:1;	/* if set, this is a template map */
     uint32 nosmooth:1;  /* if set the content of this map has smoothlevel=0 forced*/
     sint32 timeout;	/* swapout is set to this */