[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.48 by root, Thu Sep 14 23:13:48 2006 UTC

   object *op;
   for (op = object::first; op != NULL; op = op->next)
     {
       dump_object (op);
-      fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
+      fprintf (logfile, "Object %s\n", errmsg);
     }
 }
 /*
  * get_nearest_part(multi-object, object 2) returns the part of the
   object *op;
   for (op = object::first; op != NULL; op = op->next)
     if (op->count == i)
       break;
   return op;
 }
 /*
  * Returns the first object which has a name equal to the argument.
   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;
 remove_ob (object *op)
 {
   object *tmp, *last = 0;
   object *otmp;
-  tag_t tag;
   int check_walk_off;
   mapstruct *m;
   sint16 x, y;
       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
           /* 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))
             {
               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, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
-                }
             }
           /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
           if (tmp->above == tmp)
  */
 int
 check_move_on (object *op, object *originator)
 {
-  object *
+  object *tmp;
-    tmp;
+  mapstruct *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.
       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.48 by root, Thu Sep 14 23:13:48 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.48 by root, Thu Sep 14 23:13:48 2006 UTC