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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.47 by root, Thu Sep 14 22:33:59 2006 UTC vs.
Revision 1.58 by pippijn, Mon Dec 4 17:48:35 2006 UTC

  * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
  *      Some error messages.
  * The result of the dump is stored in the static global errmsg array.
  */
-void
+char *
-dump_object2 (object *op)
-{
-  errmsg[0] = 0;
-  return;
-  //TODO//D#d#
-#if 0
-  char *cp;
-/*  object *tmp;*/
-  if (op->arch != NULL)
-    {
-      strcat (errmsg, "arch ");
-      strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
-      strcat (errmsg, "\n");
-      if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
-        strcat (errmsg, cp);
-# if 0
-      /* Don't dump player diffs - they are too long, mostly meaningless, and
-       * will overflow the buffer.
-       * Changed so that we don't dump inventory either.  This may
-       * also overflow the buffer.
-       */
-      if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
-        strcat (errmsg, cp);
-      for (tmp = op->inv; tmp; tmp = tmp->below)
-        dump_object2 (tmp);
-# endif
-      strcat (errmsg, "end\n");
-    }
-  else
-    {
-      strcat (errmsg, "Object ");
-      if (op->name == NULL)
-        strcat (errmsg, "(null)");
-      else
-        strcat (errmsg, op->name);
-      strcat (errmsg, "\n");
-# if 0
-      if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
-        strcat (errmsg, cp);
-      for (tmp = op->inv; tmp; tmp = tmp->below)
-        dump_object2 (tmp);
-# endif
-      strcat (errmsg, "end\n");
-    }
-#endif
-}
-/*
- * Dumps an object.  Returns output in the static global errmsg array.
- */
-void
 dump_object (object *op)
 {
-  if (op == NULL)
+  if (!op)
-    {
+    return strdup ("[NULLOBJ]");
-      strcpy (errmsg, "[NULL pointer]");
-      return;
-    }
-  errmsg[0] = '\0';
-  dump_object2 (op);
-}
-void
+  object_freezer freezer;
-dump_all_objects (void)
+  save_object (freezer, op, 3);
-{
+  return freezer.as_string ();
-  object *op;
-  for (op = object::first; op != NULL; op = op->next)
-    {
-      dump_object (op);
-      fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
-    }
 }
 /*
  * get_nearest_part(multi-object, object 2) returns the part of the
  * multi-object 1 which is closest to the second object.
  */
 object *
 find_object (tag_t i)
 {
-  object *op;
-  for (op = object::first; op != NULL; op = op->next)
+  for (object *op = object::first; op; op = op->next)
     if (op->count == i)
-      break;
+      return op;
-  return op;
+  return 0;
 }
 /*
  * Returns the first object which has a name equal to the argument.
  * Used only by the patch command, but not all that useful.
     else
       {
         delete *i;
         mortals.erase (i);
       }
-  static int lastmortals = 0;//D
-  if (mortals.size() != lastmortals)//D
-    {
-      lastmortals = mortals.size ();//D
-      LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
-    }
 }
 object::object ()
 {
   SET_FLAG (this, FLAG_REMOVED);
   object::first = this;
 }
 void object::unlink ()
 {
-  //count = 0;//D
-  if (!prev && !next) return;//D
   if (this == object::first)
     object::first = next;
   /* Remove this object from the list of used objects */
   if (prev) prev->next = next;
  * it from the list of used objects, and puts it on the list of
  * free objects.  The IS_FREED() flag is set in the object.
  * The object must have been removed by remove_ob() first for
  * this function to succeed.
  *
- * If free_inventory is set, free inventory as well. Else drop items in
+ * If destroy_inventory is set, free inventory as well. Else drop items in
  * inventory to the ground.
  */
-void object::free (bool free_inventory)
+void object::destroy (bool destroy_inventory)
 {
   if (QUERY_FLAG (this, FLAG_FREED))
     return;
   if (QUERY_FLAG (this, FLAG_FRIENDLY))
   SET_FLAG (this, FLAG_FREED);
   if (more)
     {
-      more->free (free_inventory);
+      more->destroy (destroy_inventory);
       more = 0;
     }
   if (inv)
     {
       /* Only if the space blocks everything do we not process -
        * if some form of movement is allowed, let objects
        * drop on that space.
        */
-      if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
+      if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
         {
           object *op = inv;
           while (op)
             {
               object *tmp = op->below;
-              op->free (free_inventory);
+              op->destroy (destroy_inventory);
               op = tmp;
             }
         }
       else
         {                       /* Put objects in inventory onto this space */
               op = tmp;
             }
         }
     }
+  // hack to ensure that freed objects still have a valid map
+  {
+    static maptile *freed_map; // freed objects are moved here to avoid crashes
+    if (!freed_map)
+      {
+        freed_map = new maptile;
+        freed_map->name   = "/internal/freed_objects_map";
+        freed_map->width  = 3;
+        freed_map->height = 3;
+        freed_map->allocate ();
+      }
+    map = freed_map;
+    x = 1;
+    y = 1;
+  }
   // clear those pointers that likely might have circular references to us
   owner       = 0;
   enemy       = 0;
   attacked_by = 0;
+  // only relevant for players(?), but make sure of it anyways
+  contr       = 0;
   /* Remove object from the active list */
   speed = 0;
   update_ob_speed (this);
 remove_ob (object *op)
 {
   object *tmp, *last = 0;
   object *otmp;
-  tag_t tag;
   int check_walk_off;
-  mapstruct *m;
+  maptile *m;
   sint16 x, y;
   if (QUERY_FLAG (op, FLAG_REMOVED))
     return;
            * use translated coordinates in case some oddness with map tiling is
            * evident
            */
           if (GET_MAP_OB (m, x, y) != op)
             {
-              dump_object (op);
+              char *dump = dump_object (op);
               LOG (llevError,
-                   "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);
+                   "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
+              free (dump);
-              dump_object (GET_MAP_OB (m, x, y));
+              dump = dump_object (GET_MAP_OB (m, x, y));
-              LOG (llevError, "%s\n", errmsg);
+              LOG (llevError, "%s\n", dump);
+              free (dump);
             }
           SET_MAP_OB (m, x, y, op->above);      /* goes on above it. */
         }
       op->below = 0;
       if (op->map->in_memory == MAP_SAVING)
         return;
-      tag = op->count;
       check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
       for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
         {
           /* No point updating the players look faces if he is the object
               tmp->contr->socket.update_look = 1;
             }
           /* See if player moving off should effect something */
-          if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
+          if (check_walk_off
+              && ((op->move_type & tmp->move_off)
+                  && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
             {
               move_apply (tmp, op, NULL);
-              if (was_destroyed (op, tag))
+              if (op->destroyed ())
-                {
-                  LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
+                LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
-                }
             }
           /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
           if (tmp->above == tmp)
 /*
  * same as insert_ob_in_map except it handle separate coordinates and do a clean
  * job preparing multi-part monsters
  */
 object *
-insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)
+insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
 {
   object *tmp;
   if (op->head)
     op = op->head;
  *   NULL if 'op' was destroyed
  *   just 'op' otherwise
  */
 object *
-insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)
+insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
 {
   object *tmp, *top, *floor = NULL;
   sint16 x, y;
   if (QUERY_FLAG (op, FLAG_FREED))
       return NULL;
     }
   if (m == NULL)
     {
-      dump_object (op);
+      char *dump = dump_object (op);
-      LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);
+      LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
+      free (dump);
       return op;
     }
   if (out_of_map (m, op->x, op->y))
     {
-      dump_object (op);
+      char *dump = dump_object (op);
-      LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);
+      LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
 #ifdef MANY_CORES
       /* Better to catch this here, as otherwise the next use of this object
        * is likely to cause a crash.  Better to find out where it is getting
        * improperly inserted.
        */
       abort ();
 #endif
+      free (dump);
       return op;
     }
   if (!QUERY_FLAG (op, FLAG_REMOVED))
     {
-      dump_object (op);
+      char *dump = dump_object (op);
-      LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);
+      LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
+      free (dump);
       return op;
     }
   if (op->more != NULL)
     {
   tmp, *
     otmp;
   if (!QUERY_FLAG (op, FLAG_REMOVED))
     {
-      dump_object (op);
+      char *dump = dump_object (op);
-      LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
+      LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
+      free (dump);
       return op;
     }
   if (where == NULL)
     {
-      dump_object (op);
+      char *dump = dump_object (op);
-      LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
+      LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
+      free (dump);
       return op;
     }
   if (where->head)
     {
  */
 int
 check_move_on (object *op, object *originator)
 {
-  object *
+  object *tmp;
-    tmp;
+  maptile *m = op->map;
-  tag_t
-    tag;
-  mapstruct *
-    m = op->map;
-  int
-    x = op->x, y = op->y;
+  int x = op->x, y = op->y;
-  MoveType
+  MoveType move_on, move_slow, move_block;
-    move_on,
-    move_slow,
-    move_block;
   if (QUERY_FLAG (op, FLAG_NO_APPLY))
     return 0;
-  tag = op->count;
   move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
   move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
   move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
       if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
           ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
         {
           move_apply (tmp, op, originator);
-          if (was_destroyed (op, tag))
+          if (op->destroyed ())
             return 1;
           /* what the person/creature stepped onto has moved the object
            * someplace new.  Don't process any further - if we did,
            * have a feeling strange problems would result.
  * a matching archetype at the given map and coordinates.
  * The first matching object is returned, or NULL if none.
  */
 object *
-present_arch (const archetype *at, mapstruct *m, int x, int y)
+present_arch (const archetype *at, maptile *m, int x, int y)
 {
   object *
     tmp;
   if (m == NULL || out_of_map (m, x, y))
  * a matching type variable at the given map and coordinates.
  * The first matching object is returned, or NULL if none.
  */
 object *
-present (unsigned char type, mapstruct *m, int x, int y)
+present (unsigned char type, maptile *m, int x, int y)
 {
   object *
     tmp;
   if (out_of_map (m, x, y))
  * the archetype because that isn't correct if the monster has been
  * customized, changed states, etc.
  */
 int
-find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)
+find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
 {
   int
     i,
     index = 0, flag;
   static int
     return -1;
   return altern[RANDOM () % index];
 }
 /*
- * find_first_free_spot(archetype, mapstruct, x, y) works like
+ * find_first_free_spot(archetype, maptile, x, y) works like
  * find_free_spot(), but it will search max number of squares.
  * But it will return the first available spot, not a random choice.
  * Changed 0.93.2: Have it return -1 if there is no free spot available.
  */
 int
-find_first_free_spot (const object *ob, mapstruct *m, int x, int y)
+find_first_free_spot (const object *ob, maptile *m, int x, int y)
 {
   int
     i;
   for (i = 0; i < SIZEOFFREE; i++)
  * because we have to know what movement the thing looking to move
  * there is capable of.
  */
 int
-find_dir (mapstruct *m, int x, int y, object *exclude)
+find_dir (maptile *m, int x, int y, object *exclude)
 {
   int
     i,
     max = SIZEOFFREE, mflags;
   sint16 nx, ny;
   object *
     tmp;
-  mapstruct *
+  maptile *
     mp;
   MoveType blocked, move_type;
   if (exclude && exclude->head)
  * Modified to be map tile aware -.MSW
  */
 int
-can_see_monsterP (mapstruct *m, int x, int y, int dir)
+can_see_monsterP (maptile *m, int x, int y, int dir)
 {
   sint16 dx, dy;
   int
     mflags;
       if (prev)
         prev->more = tmp;
       prev = tmp;
     }
-    /*** copy inventory ***/
   for (item = src->inv; item; item = item->below)
-    {
-      (void) insert_ob_in_ob (object_create_clone (item), dst);
+    insert_ob_in_ob (object_create_clone (item), dst);
-    }
   return dst;
 }
-/* return true if the object was destroyed, 0 otherwise */
-int
-was_destroyed (const object *op, tag_t old_tag)
-{
-  /* checking for FLAG_FREED isn't necessary, but makes this function more
-   * robust */
-  return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
-}
 /* GROS - Creates an object using a string representing its content.         */
 /* Basically, we save the content of the string to a temp file, then call    */
 /* load_object on it. I admit it is a highly inefficient way to make things, */
 /* but it was simple to make and allows reusing the load_object function.    */
 /* Remember not to use load_object_str in a time-critical situation.         */
 /* Also remember that multiparts objects are not supported for now.          */
 object *
 load_object_str (const char *obstr)
 {
-  object *
+  object *op;
-    op;
-  char
-    filename[MAX_BUF];
+  char filename[MAX_BUF];
   sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
-  FILE *
-    tempfile = fopen (filename, "w");
+  FILE *tempfile = fopen (filename, "w");
   if (tempfile == NULL)
     {
       LOG (llevError, "Error - Unable to access load object temp file\n");
       return NULL;
  * returns NULL if no match.
  */
 object *
 find_obj_by_type_subtype (const object *who, int type, int subtype)
 {
-  object *
+  object *tmp;
-    tmp;
   for (tmp = who->inv; tmp; tmp = tmp->below)
     if (tmp->type == type && tmp->subtype == subtype)
       return tmp;
  * do the desired thing.
  */
 key_value *
 get_ob_key_link (const object *ob, const char *key)
 {
-  key_value *
+  key_value *link;
-    link;
   for (link = ob->key_values; link != NULL; link = link->next)
-    {
-      if (link->key == key)
+    if (link->key == key)
-        {
-          return link;
+      return link;
-        }
-    }
   return NULL;
 }
 /*

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.47 by root, Thu Sep 14 22:33:59 2006 UTC vs. Revision 1.58 by pippijn, Mon Dec 4 17:48:35 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.47 by root, Thu Sep 14 22:33:59 2006 UTC vs.
Revision 1.58 by pippijn, Mon Dec 4 17:48:35 2006 UTC