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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.118 by root, Thu Jan 18 19:42:09 2007 UTC vs.
Revision 1.137 by root, Mon Apr 16 06:23:40 2007 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.
  */
 char *
 dump_object (object *op)
 {
   if (!op)
     return strdup ("[NULLOBJ]");
   object_freezer freezer;
-  save_object (freezer, op, 1);
+  op->write (freezer);
   return freezer.as_string ();
 }
 /*
  * get_nearest_part(multi-object, object 2) returns the part of the
  * refcounts and freeing the links.
  */
 static void
 free_key_values (object *op)
 {
-  for (key_value *i = op->key_values; i != 0;)
+  for (key_value *i = op->key_values; i; )
     {
       key_value *next = i->next;
       delete i;
       i = next;
     }
   op->key_values = 0;
 }
-/*
+object &
- * copy_to first frees everything allocated by the dst object,
+object::operator =(const object &src)
- * and then copies the contents of itself into the second
- * object, allocating what needs to be allocated.  Basically, any
- * data that is malloc'd needs to be re-malloc/copied.  Otherwise,
- * if the first object is freed, the pointers in the new object
- * will point at garbage.
- */
-void
-object::copy_to (object *dst)
 {
-  bool is_freed   = QUERY_FLAG (dst, FLAG_FREED);
+  bool is_freed   = flag [FLAG_FREED];
-  bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
+  bool is_removed = flag [FLAG_REMOVED];
-  *(object_copy *)dst = *this;
+  *(object_copy *)this = src;
-  if (is_freed)
+  flag [FLAG_FREED]   = is_freed;
-    SET_FLAG (dst, FLAG_FREED);
+  flag [FLAG_REMOVED] = is_removed;
-  if (is_removed)
-    SET_FLAG (dst, FLAG_REMOVED);
-  if (speed < 0)
-    dst->speed_left = speed_left - rndm ();
   /* Copy over key_values, if any. */
-  if (key_values)
+  if (src.key_values)
     {
       key_value *tail = 0;
-      key_value *i;
-      dst->key_values = 0;
+      key_values = 0;
-      for (i = key_values; i; i = i->next)
+      for (key_value *i = src.key_values; i; i = i->next)
         {
           key_value *new_link = new key_value;
           new_link->next = 0;
           new_link->key = i->key;
           new_link->value = i->value;
           /* Try and be clever here, too. */
-          if (!dst->key_values)
+          if (!key_values)
             {
-              dst->key_values = new_link;
+              key_values = new_link;
               tail = new_link;
             }
           else
             {
               tail->next = new_link;
               tail = new_link;
             }
         }
     }
+}
+/*
+ * copy_to first frees everything allocated by the dst object,
+ * and then copies the contents of itself into the second
+ * object, allocating what needs to be allocated.  Basically, any
+ * data that is malloc'd needs to be re-malloc/copied.  Otherwise,
+ * if the first object is freed, the pointers in the new object
+ * will point at garbage.
+ */
+void
+object::copy_to (object *dst)
+{
+  *dst = *this;
+  if (speed < 0)
+    dst->speed_left = speed_left - rndm ();
   dst->set_speed (dst->speed);
+}
+void
+object::instantiate ()
+{
+  if (!uuid.seq) // HACK
+    uuid = gen_uuid ();
+  speed_left = -0.1f;
+  /* copy the body_info to the body_used - this is only really
+   * need for monsters, but doesn't hurt to do it for everything.
+   * by doing so, when a monster is created, it has good starting
+   * values for the body_used info, so when items are created
+   * for it, they can be properly equipped.
+   */
+  memcpy (body_used, body_info, sizeof (body_used));
+  attachable::instantiate ();
 }
 object *
 object::clone ()
 {
  * UP_OBJ_FACE: only the objects face has changed.
  */
 void
 update_object (object *op, int action)
 {
-  MoveType move_on, move_off, move_block, move_slow;
   if (op == NULL)
     {
       /* this should never happen */
       LOG (llevDebug, "update_object() called for NULL object.\n");
       return;
   face = blank_face;
 }
 object::~object ()
 {
+  unlink ();
   free_key_values (this);
 }
 static int object_count;
   objects.insert (this);
 }
 void object::unlink ()
 {
-  assert (index);//D
+  if (!index)
+    return;
   objects.erase (this);
   refcnt_dec ();
 }
 void
    * drop on that space.
    */
   if (!drop_to_ground
       || !map
       || map->in_memory != MAP_IN_MEMORY
+      || map->nodrop
       || ms ().move_block == MOVE_ALL)
     {
       while (inv)
         {
           inv->destroy_inv (drop_to_ground);
   if (flag [FLAG_IS_LINKED])
     remove_button_link (this);
   if (flag [FLAG_FRIENDLY])
+    {
-    remove_friendly_object (this);
+      remove_friendly_object (this);
+      if (type == GOLEM
+          && owner
+          && owner->type == PLAYER
+          && owner->contr->ranges[range_golem] == this)
+        owner->contr->ranges[range_golem] = 0;
+    }
   if (!flag [FLAG_REMOVED])
     remove ();
   destroy_inv (true);
  *   This function removes the object op from the linked list of objects
  *   which it is currently tied to.  When this function is done, the
  *   object will have no environment.  If the object previously had an
  *   environment, the x and y coordinates will be updated to
  *   the previous environment.
- *   Beware: This function is called from the editor as well!
  */
 void
-object::remove_slow ()
+object::do_remove ()
 {
   object *tmp, *last = 0;
   object *otmp;
   if (QUERY_FLAG (this, FLAG_REMOVED))
     }
   else if (map)
     {
       if (type == PLAYER)
         {
+          // leaving a spot always closes any open container on the ground
+          if (container && !container->env)
+            // this causes spurious floorbox updates, but it ensures
+            // that the CLOSE event is being sent.
+            close_container ();
           --map->players;
           map->touch ();
         }
       map->dirty = true;
            * looks like instead of lots of conditions here.
            * makes things faster, and effectively the same result.
            */
           /* Have object 'fall below' other objects that block view.
-           * Unless those objects are exits, type 66
+           * Unless those objects are exits.
            * If INS_ON_TOP is used, don't do this processing
            * Need to find the object that in fact blocks view, otherwise
            * stacking is a bit odd.
            */
           if (!(flag & INS_ON_TOP)
               && ms.flags () & P_BLOCKSVIEW
-              && (op->face && !op->face->visibility))
+              && (op->face && !faces [op->face].visibility))
             {
               for (last = top; last != floor; last = last->below)
                 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
                   break;
   tmp1->x = op->x;
   tmp1->y = op->y;
   insert_ob_in_map (tmp1, op->map, op, 0);
 }
+// XXX: function not returning object*
 object *
 object::insert_at (object *where, object *originator, int flags)
 {
   where->map->insert (this, where->x, where->y, originator, flags);
 }
           if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
               ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
             {
               float
-                diff = tmp->move_slow_penalty * FABS (op->speed);
+                diff = tmp->move_slow_penalty * fabs (op->speed);
               if (op->type == PLAYER)
                 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
                     (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
                   diff /= 4.0;
     }
   if (!index)
     return -1;
-  return altern[RANDOM () % index];
+  return altern [rndm (index)];
 }
 /*
  * find_first_free_spot(archetype, maptile, x, y) works like
  * find_free_spot(), but it will search max number of squares.
 {
   arr += begin;
   end -= begin;
   while (--end)
-    swap (arr [end], arr [RANDOM () % (end + 1)]);
+    swap (arr [end], arr [rndm (end + 1)]);
 }
 /* new function to make monster searching more efficient, and effective!
  * This basically returns a randomized array (in the passed pointer) of
  * the spaces to find monsters.  In this way, it won't always look for
     insert_ob_in_ob (object_create_clone (item), dst);
   return dst;
 }
-/* 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 *op;
-  char filename[MAX_BUF];
-  sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
-  FILE *tempfile = fopen (filename, "w");
-  if (tempfile == NULL)
-    {
-      LOG (llevError, "Error - Unable to access load object temp file\n");
-      return NULL;
-    }
-  fprintf (tempfile, obstr);
-  fclose (tempfile);
-  op = object::create ();
-  object_thawer thawer (filename);
-  if (thawer)
-    load_object (thawer, op, 0);
-  LOG (llevDebug, " load str completed, object=%s\n", &op->name);
-  CLEAR_FLAG (op, FLAG_REMOVED);
-  return op;
-}
 /* This returns the first object in who's inventory that
  * has the same type and subtype match.
  * returns NULL if no match.
  */
 object *
     if (link->key == canonical_key)
       return link->value;
   return 0;
 }
 /*
  * Updates the canonical_key in op to value.
  *
  * canonical_key is a shared string (value doesn't have to be).
 {
   char flagdesc[512];
   char info2[256 * 4];
   char *p = info;
-  p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
+  p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
                  count, uuid.seq,
                  &name,
                  title ? "\",title:\"" : "",
                  title ? (const char *)title : "",
                  flag_desc (flagdesc, 512), type);
 {
   static char info[256 * 4];
   return debug_desc (info);
 }
+struct region *
+object::region () const
+{
+  return map ? map->region (x, y)
+             : region::default_region ();
+}
+const materialtype_t *
+object::dominant_material () const
+{
+  if (materialtype_t *mat = name_to_material (materialname))
+    return mat;
+  // omfg this is slow, this has to be temporary :)
+  shstr unknown ("unknown");
+  return name_to_material (unknown);
+}
+void
+object::open_container (object *new_container)
+{
+  if (container == new_container)
+    return;
+  if (object *old_container = container)
+    {
+      if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
+        return;
+#if 0
+      // remove the "Close old_container" object.
+      if (object *closer = old_container->inv)
+        if (closer->type == CLOSE_CON)
+          closer->destroy ();
+#endif
+      old_container->flag [FLAG_APPLIED] = 0;
+      container = 0;
+      esrv_update_item (UPD_FLAGS, this, old_container);
+      new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
+    }
+  if (new_container)
+    {
+      if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
+        return;
+      // TODO: this does not seem to serve any purpose anymore?
+#if 0
+      // insert the "Close Container" object.
+      if (archetype *closer = new_container->other_arch)
+        {
+          object *closer = arch_to_object (new_container->other_arch);
+          closer->flag [FLAG_NO_MAP_SAVE] = 1;
+          new_container->insert (closer);
+        }
+#endif
+      new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
+      new_container->flag [FLAG_APPLIED] = 1;
+      container = new_container;
+      esrv_update_item (UPD_FLAGS, this, new_container);
+      esrv_send_inventory (this, new_container);
+    }
+}

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.118 by root, Thu Jan 18 19:42:09 2007 UTC vs. Revision 1.137 by root, Mon Apr 16 06:23:40 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.118 by root, Thu Jan 18 19:42:09 2007 UTC vs.
Revision 1.137 by root, Mon Apr 16 06:23:40 2007 UTC