--- deliantra/server/common/map.C	2006/12/26 20:04:09	1.52
+++ deliantra/server/common/map.C	2006/12/27 09:28:01	1.53
@@ -37,16 +37,14 @@
 maptile *
 has_been_loaded (const char *name)
 {
-  maptile *map;
-
   if (!name || !*name)
     return 0;
 
-  for (map = first_map; map; map = map->next)
+  for_all_maps (map)
     if (!strcmp (name, map->path))
-      break;
+      return map;
 
-  return (map);
+  return 0;
 }
 
 /*
@@ -223,9 +221,7 @@
 void
 dump_all_maps (void)
 {
-  maptile *m;
-
-  for (m = first_map; m; m = m->next)
+  for_all_maps (m)
     dump_map (m);
 }
 
@@ -478,7 +474,6 @@
  * they are saved).  We do have to look for the old maps that did save
  * the more sections and not re-add sections for them.
  */
-
 static void
 link_multipart_objects (maptile *m)
 {
@@ -639,15 +634,15 @@
   /* The maps used to pick up default x and y values from the
    * map archetype.  Mimic that behaviour.
    */
-  this->width = 16;
-  this->height = 16;
-  this->reset_timeout = 0;
-  this->timeout = 300;
-  this->enter_x = 0;
-  this->enter_y = 0;
+  width         = 16;
+  height        = 16;
+  reset_timeout = 0;
+  timeout       = 300;
+  enter_x       = 0;
+  enter_y       = 0;
   /*set part to -1 indicating conversion to weather map not yet done */
-  this->worldpartx = -1;
-  this->worldparty = -1;
+  worldpartx    = -1;
+  worldparty    = -1;
 }
 
 /*
@@ -658,14 +653,10 @@
 maptile *
 get_linked_map (void)
 {
-  maptile *mp, *map = new maptile;
+  maptile *map = new maptile;
 
-  for (mp = first_map; mp && mp->next; mp = mp->next);
-
-  if (mp == NULL)
-    first_map = map;
-  else
-    mp->next = map;
+  map->next = first_map;
+  first_map = map;
 
   return map;
 }
@@ -687,14 +678,10 @@
   if (spaces)
     {
       LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
-      free (spaces);
+      sfree (spaces, size ());
     }
 
-  spaces = (mapspace *)
-    calloc (1, width * height * sizeof (mapspace));
-
-  if (!spaces)
-    fatal (OUT_OF_MEMORY);
+  spaces = salloc0<mapspace> (size ());
 }
 
 /* Create and returns a map of the specific size.  Used
@@ -1263,7 +1250,6 @@
       }
 }
 
-
 /*
  * Loads unique objects from file(s) into the map which is in memory
  * m is the map to load unique items into.
@@ -1489,8 +1475,9 @@
   if (flag && m->spaces)
     free_all_objects (m);
 
+  sfree (m->spaces, m->size ()), m->spaces = 0;
+
   free (m->name),     m->name = 0;
-  free (m->spaces),   m->spaces = 0;
   free (m->msg),      m->msg = 0;
   free (m->maplore),  m->maplore = 0;
   free (m->shoprace), m->shoprace = 0;
@@ -1500,20 +1487,14 @@
     free_objectlinkpt (m->buttons), m->buttons = 0;
 
   for (int i = 0; i < 4; i++)
-    {
-      if (m->tile_path[i])
-        free (m->tile_path[i]), m->tile_path[i] = 0;
-
-      m->tile_map[i] = 0;
-    }
+    free (m->tile_path[i]), m->tile_path[i] = 0;
 
   m->in_memory = MAP_SWAPPED;
 }
 
 maptile::~maptile ()
 {
-  free_map (this, 1);
-  free (tmpname);
+  assert (destroyed ());
 }
 
 void
@@ -1521,7 +1502,8 @@
 {
   attachable::do_destroy ();
 
-  free_all_objects (this);
+  free_map (this, 1);
+  free (tmpname), tmpname = 0;
 
   /* We need to look through all the maps and see if any maps
    * are pointing at this one for tiling information.  Since
@@ -1529,7 +1511,7 @@
    * maps this map tiles with and clears those.
    */
   //TODO: non-euclidean-tiling MUST GO
-  for (maptile *m = first_map; m; m = m->next)
+  for_all_maps (m)
     for (int i = 0; i < 4; i++)
       if (m->tile_map[i] == this)
         m->tile_map[i] = 0;
@@ -1537,7 +1519,7 @@
   if (first_map == this)
     first_map = next;
   else
-    for (maptile *m = first_map; m; m = m->next)
+    for_all_maps (m)
       if (m->next = this)
         {
           m->next = next;
@@ -1749,6 +1731,7 @@
       delete_map (first_map);
       real_maps++;
     }
+
   LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
 }