--- deliantra/server/common/map.C	2006/08/21 02:58:22	1.7
+++ deliantra/server/common/map.C	2006/08/26 08:44:04	1.8
@@ -1,6 +1,6 @@
 /*
  * static char *rcsid_map_c =
- *   "$Id: map.C,v 1.7 2006/08/21 02:58:22 elmex Exp $";
+ *   "$Id: map.C,v 1.8 2006/08/26 08:44:04 root Exp $";
  */
 
 /*
@@ -40,10 +40,6 @@
 
 extern int nrofallocobjects,nroffreeobjects;
 
-void (*load_original_map_callback)(mapstruct *map);
-void (*load_temporary_map_callback)(mapstruct *map);
-void (*clean_temporary_map_callback)(mapstruct *map);
-
 /*
  * Returns the mapstruct which has a name matching the given argument.
  * return NULL if no match is found.
@@ -1057,8 +1053,7 @@
     if (!MAP_DIFFICULTY(m)) 
 	MAP_DIFFICULTY(m)=calculate_difficulty(m);
     set_map_reset_time(m);
-    if (load_original_map_callback)
-      load_original_map_callback(m);
+    INVOKE_MAP (LOAD, m);
     return (m);
 }
 
@@ -1108,8 +1103,7 @@
     load_objects (m, fp, 0);
     close_and_delete(fp, comp);
     m->in_memory=MAP_IN_MEMORY;
-    if (load_temporary_map_callback)
-      load_temporary_map_callback(m);
+    INVOKE_MAP (SWAPIN, m);
     return m;
 }
 
@@ -1683,8 +1677,7 @@
 void clean_tmp_map(mapstruct *m) {
     if(m->tmpname == NULL)
 	return;
-  if (clean_temporary_map_callback)
-    clean_temporary_map_callback (m);
+  INVOKE_MAP (CLEAN, m);
   (void) unlink(m->tmpname);
 }