--- deliantra/server/include/map.h	2006/08/29 08:01:36	1.13
+++ deliantra/server/include/map.h	2006/09/03 00:18:41	1.17
@@ -159,7 +159,7 @@
 
 #define AB_NO_PASS       0x04
 /*#define P_PASS_THRU     0x08	*//* */
-#define	P_SAFE          0x08	/* If this is set the map is a safe map,
+#define	P_SAFE          0x08	/* If this is set the map tile is a safe map,
                                  * that means, nothing harmful there will be done,
                                  * like: bombs, potion usage, alchemy, spells
                                  * this was introduced to make shops more safe
@@ -279,9 +279,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 +294,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 */