--- deliantra/server/common/map.C	2006/12/12 22:37:05	1.41
+++ deliantra/server/common/map.C	2006/12/13 02:55:49	1.42
@@ -1534,6 +1534,10 @@
       LOG (llevError, "Trying to free freed map.\n");
       return;
     }
+
+  // TODO: use new/delete
+#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
+
   if (flag && m->spaces)
     free_all_objects (m);
   if (m->name)
@@ -1544,21 +1548,29 @@
     FREE_AND_CLEAR (m->msg);
   if (m->maplore)
     FREE_AND_CLEAR (m->maplore);
-  if (m->shopitems)
-    delete[]m->shopitems;
+
+  delete [] m->shopitems;
   m->shopitems = 0;
+
   if (m->shoprace)
     FREE_AND_CLEAR (m->shoprace);
+
   if (m->buttons)
     free_objectlinkpt (m->buttons);
+
   m->buttons = NULL;
+
   for (i = 0; i < 4; i++)
     {
       if (m->tile_path[i])
         FREE_AND_CLEAR (m->tile_path[i]);
       m->tile_map[i] = NULL;
     }
+
   m->in_memory = MAP_SWAPPED;
+
+#undef FREE_AND_CLEAR
+
 }
 
 /*
@@ -2098,7 +2110,7 @@
     timeout = MAP_DEFAULTRESET;
   if (timeout >= MAP_MAXRESET)
     timeout = MAP_MAXRESET;
-  MAP_WHEN_RESET (map) = seconds () + timeout;
+  MAP_WHEN_RESET (map) = time (0) + timeout;
 }
 
 /* this updates the orig_map->tile_map[tile_num] value after loading