--- deliantra/server/include/map.h	2006/08/15 17:35:50	1.8
+++ deliantra/server/include/map.h	2006/08/28 14:05:24	1.12
@@ -34,6 +34,8 @@
 #ifndef MAP_H
 #define MAP_H
 
+#include "cfperl.h"
+
 /* We set this size - this is to make magic map work properly on
  * tiled maps.  There is no requirement that this matches the
  * tiled maps size - it just seemed like a reasonable value.
@@ -277,7 +279,9 @@
  * (or even through the macros), but doing so will completely
  * break map tiling.
  */
-struct mapstruct {
+struct mapstruct : attachable<mapstruct> {
+    static data_type get_dt () { return DT_MAP; }
+
     struct mapstruct *next;	/* Next map, linked list */
     char *tmpname;	/* Name of temporary file */
     char *name;		/* Name of map as given by its creator */
@@ -301,7 +305,6 @@
     uint32 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 */
-    uint8 compressed;	/* Compression method used */
     uint16 difficulty;	/* What level the player should be to play here */
 
     uint8 darkness;    	/* indicates level of darkness of map */
@@ -347,8 +350,4 @@
     object  *part;
 };
 
-extern void (*load_original_map_callback)(mapstruct *map);
-extern void (*load_temporary_map_callback)(mapstruct *map);
-extern void (*clean_temporary_map_callback)(mapstruct *map);
-
 #endif