[ViewVC] Diff of: cvs/deliantra/server/common/map.C

Comparing deliantra/server/common/map.C (file contents):
Revision 1.49 by root, Mon Dec 25 14:54:44 2006 UTC vs.
Revision 1.53 by root, Wed Dec 27 09:28:01 2006 UTC

  * return NULL if no match is found.
  */
 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;
 }
 /*
  * This makes a path absolute outside the world of Crossfire.
  * In other words, it prepends LIBDIR/MAPDIR/ to the given path
  */
 void
 dump_all_maps (void)
 {
-  maptile *m;
+  for_all_maps (m)
-  for (m = first_map; m; m = m->next)
     dump_map (m);
 }
 /* This rolls up wall, blocks_magic, blocks_view, etc, all into
  * one function that just returns a P_.. value (see map.h)
  * for objects whose arch says they are multipart yet according to the
  * info we have, they only have the head (as would be expected when
  * 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)
 {
   int x, y;
   object *tmp, *op, *last, *above;
  * Modified by MSW 2001-07-01 to do in a single pass - reduces code,
  * and we only save the head of multi part objects - this is needed
  * in order to do map tiling properly.
  */
 void
-save_objects (maptile *m, object_freezer & fp, object_freezer & fp2, int flag)
+save_objects (maptile *m, object_freezer &fp, object_freezer &fp2, int flag)
 {
   int i, j = 0, unique = 0;
   object *op;
   /* first pass - save one-part objects */
   for (i = 0; i < m->width; i++)
     for (j = 0; j < m->height; j++)
       {
         unique = 0;
         for (op = m->at (i, j).bot; op; op = op->above)
           {
-            if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
+            if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
               unique = 1;
             if (op->type == PLAYER)
               continue;
             if (op->head || op->owner)
               continue;
             if (unique || op->flag [FLAG_UNIQUE])
-              save_object (fp2, op, 3);
+              save_object (fp2, op, 1);
             else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID])))
-              save_object (fp, op, 3);
+              save_object (fp, op, 1);
           }
       }
 }
 maptile::maptile ()
 {
   in_memory = MAP_SWAPPED;
   /* The maps used to pick up default x and y values from the
    * map archetype.  Mimic that behaviour.
    */
-  this->width = 16;
+  width         = 16;
-  this->height = 16;
+  height        = 16;
-  this->reset_timeout = 0;
+  reset_timeout = 0;
-  this->timeout = 300;
+  timeout       = 300;
-  this->enter_x = 0;
+  enter_x       = 0;
-  this->enter_y = 0;
+  enter_y       = 0;
   /*set part to -1 indicating conversion to weather map not yet done */
-  this->worldpartx = -1;
+  worldpartx    = -1;
-  this->worldparty = -1;
+  worldparty    = -1;
 }
 /*
  * Allocates, initialises, and returns a pointer to a maptile.
  * Modified to no longer take a path option which was not being
  * used anyways.  MSW 2001-07-01
  */
 maptile *
 get_linked_map (void)
 {
-  maptile *mp, *map = new maptile;
+  maptile *map = new maptile;
-  for (mp = first_map; mp && mp->next; mp = mp->next);
+  map->next = first_map;
-  if (mp == NULL)
-    first_map = map;
+  first_map = map;
-  else
-    mp->next = map;
   return map;
 }
 /*
    * that is their poor assumption.
    */
   if (spaces)
     {
       LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
-      free (spaces);
+      sfree (spaces, size ());
     }
-  spaces = (mapspace *)
+  spaces = salloc0<mapspace> (size ());
-    calloc (1, width * height * sizeof (mapspace));
-  if (!spaces)
-    fatal (OUT_OF_MEMORY);
 }
 /* Create and returns a map of the specific size.  Used
  * in random map code and the editor.
  */
               }
           }
       }
 }
 /*
  * Loads unique objects from file(s) into the map which is in memory
  * m is the map to load unique items into.
  */
 static void
     return;
   m->in_memory = MAP_LOADING;
   if (m->tmpname == NULL)       /* if we have loaded unique items from */
     delete_unique_items (m);    /* original map before, don't duplicate them */
   load_objects (m, thawer, 0);
   m->in_memory = MAP_IN_MEMORY;
 }
 /*
  * Saves a map to file.  If flag is set, it is saved into the same
  * file it was (originally) loaded from.  Otherwise a temporary
  * filename will be genarated, and the file will be stored there.
  * The temporary filename will be stored in the maptileure.
  * If the map is unique, we also save to the filename in the map
  * (this should have been updated when first loaded)
  */
 int
 new_save_map (maptile *m, int flag)
 {
   char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
   int i;
  * don't free tmpname - our caller is left to do that
  */
 void
 free_map (maptile *m, int flag)
 {
-  if (m->in_memory != MAP_IN_MEMORY)
+  if (!m->in_memory) //TODO: makes no sense to me?
     return;
   m->in_memory = MAP_SAVING;
   // TODO: use new/delete
-#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
   if (flag && m->spaces)
     free_all_objects (m);
-  if (m->name)
-    FREE_AND_CLEAR (m->name);
-  if (m->spaces)
-    FREE_AND_CLEAR (m->spaces);
-  if (m->msg)
-    FREE_AND_CLEAR (m->msg);
-  if (m->maplore)
-    FREE_AND_CLEAR (m->maplore);
-  delete [] m->shopitems;
+  sfree (m->spaces, m->size ()), m->spaces = 0;
-  m->shopitems = 0;
-  if (m->shoprace)
+  free (m->name),     m->name = 0;
-    FREE_AND_CLEAR (m->shoprace);
+  free (m->msg),      m->msg = 0;
+  free (m->maplore),  m->maplore = 0;
+  free (m->shoprace), m->shoprace = 0;
+  delete [] m->shopitems, m->shopitems = 0;
   if (m->buttons)
-    free_objectlinkpt (m->buttons);
+    free_objectlinkpt (m->buttons), m->buttons = 0;
-  m->buttons = NULL;
   for (int i = 0; i < 4; i++)
-    {
+    free (m->tile_path[i]), m->tile_path[i] = 0;
-      if (m->tile_path[i])
-        FREE_AND_CLEAR (m->tile_path[i]);
-      m->tile_map[i] = 0;
-    }
   m->in_memory = MAP_SWAPPED;
-#undef FREE_AND_CLEAR
 }
 maptile::~maptile ()
 {
-  free_map (this, 1);
+  assert (destroyed ());
-  free (tmpname);
 }
 void
 maptile::do_destroy ()
 {
   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
    * tiling can be asymetric, we just can not look to see which
    * 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;
   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;
           break;
         }
       if (first_map->in_memory == MAP_SAVING)
         first_map->in_memory = MAP_IN_MEMORY;
       delete_map (first_map);
       real_maps++;
     }
   LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
 }
 /* change_map_light() - used to change map light level (darkness)
  * up or down. Returns true if successful.   It should now be
 {
   int dx, dy;
   return adjacent_map (op1->map, op2->map, &dx, &dy);
 }
+object *
+maptile::insert (object *op, int x, int y, object *originator, int flags)
+{
+  if (!op->flag [FLAG_REMOVED])
+    op->remove ();
+  return insert_ob_in_map_at (op, this, originator, flags, x, y);
+}

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/common/map.C (file contents): Revision 1.49 by root, Mon Dec 25 14:54:44 2006 UTC vs. Revision 1.53 by root, Wed Dec 27 09:28:01 2006 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.49 by root, Mon Dec 25 14:54:44 2006 UTC vs.
Revision 1.53 by root, Wed Dec 27 09:28:01 2006 UTC