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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.58 by pippijn, Mon Dec 4 17:48:35 2006 UTC vs.
Revision 1.63 by root, Tue Dec 12 20:53:02 2006 UTC

       _exit (1);
     }
   uuid.seq = uid;
   write_uuid ();
-  LOG (llevDebug, "read UID: %lld\n", uid);
+  LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
   fclose (fp);
 }
 UUID
 gen_uuid ()
   op2->clone (op);
   if (is_freed)
     SET_FLAG (op, FLAG_FREED);
   if (is_removed)
     SET_FLAG (op, FLAG_REMOVED);
   if (op2->speed < 0)
     op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
         update_now = 1;
       if ((move_slow | op->move_slow) != move_slow)
         update_now = 1;
     }
   /* if the object is being removed, we can't make intelligent
    * decisions, because remove_ob can't really pass the object
    * that is being removed.
    */
   else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
   if (QUERY_FLAG (this, FLAG_FRIENDLY))
     remove_friendly_object (this);
   if (!QUERY_FLAG (this, FLAG_REMOVED))
-    remove_ob (this);
+    remove ();
   SET_FLAG (this, FLAG_FREED);
   if (more)
     {
           while (op)
             {
               object *tmp = op->below;
-              remove_ob (op);
+              op->remove ();
               if (QUERY_FLAG (op, FLAG_STARTEQUIP)
                   || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
-                free_object (op);
+                op->destroy (0);
               else
                 {
                   op->x = x;
                   op->y = y;
                   insert_ob_in_map (op, map, 0, 0);     /* Insert in same map as the envir */
 /*
  * sub_weight() recursively (outwards) subtracts a number from the
  * weight of an object (and what is carried by it's environment(s)).
  */
 void
 sub_weight (object *op, signed long weight)
 {
   while (op != NULL)
     {
       op->carrying -= weight;
       op = op->env;
     }
 }
-/* remove_ob(op):
+/* op->remove ():
  *   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
-remove_ob (object *op)
+object::remove ()
 {
   object *tmp, *last = 0;
   object *otmp;
   int check_walk_off;
-  maptile *m;
-  sint16 x, y;
-  if (QUERY_FLAG (op, FLAG_REMOVED))
+  if (QUERY_FLAG (this, FLAG_REMOVED))
     return;
-  SET_FLAG (op, FLAG_REMOVED);
+  SET_FLAG (this, FLAG_REMOVED);
-  if (op->more != NULL)
+  if (more)
-    remove_ob (op->more);
+    more->remove ();
   /*
    * In this case, the object to be removed is in someones
    * inventory.
    */
-  if (op->env != NULL)
+  if (env)
     {
-      if (op->nrof)
+      if (nrof)
-        sub_weight (op->env, op->weight * op->nrof);
+        sub_weight (env, weight * nrof);
       else
-        sub_weight (op->env, op->weight + op->carrying);
+        sub_weight (env, weight + carrying);
       /* NO_FIX_PLAYER is set when a great many changes are being
        * made to players inventory.  If set, avoiding the call
        * to save cpu time.
        */
-      if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
+      if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
         fix_player (otmp);
-      if (op->above != NULL)
+      if (above != NULL)
-        op->above->below = op->below;
+        above->below = below;
       else
-        op->env->inv = op->below;
+        env->inv = below;
-      if (op->below != NULL)
+      if (below != NULL)
-        op->below->above = op->above;
+        below->above = above;
       /* we set up values so that it could be inserted into
        * the map, but we don't actually do that - it is up
        * to the caller to decide what we want to do.
        */
-      op->x = op->env->x, op->y = op->env->y;
+      x = env->x, y = env->y;
-      op->map = op->env->map;
+      map = env->map;
-      op->above = NULL, op->below = NULL;
+      above = 0, below = 0;
-      op->env = NULL;
+      env = 0;
     }
-  else if (op->map)
+  else if (map)
     {
-      x = op->x;
-      y = op->y;
-      m = get_map_from_coord (op->map, &x, &y);
-      if (!m)
-        {
-          LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
-               op->map->path, op->x, op->y);
-          /* in old days, we used to set x and y to 0 and continue.
-           * it seems if we get into this case, something is probablye
-           * screwed up and should be fixed.
-           */
-          abort ();
-        }
-      if (op->map != m)
-        LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
-             op->map->path, m->path, op->x, op->y, x, y);
       /* Re did the following section of code - it looks like it had
        * lots of logic for things we no longer care about
        */
       /* link the object above us */
-      if (op->above)
+      if (above)
-        op->above->below = op->below;
+        above->below = below;
       else
-        SET_MAP_TOP (m, x, y, op->below);       /* we were top, set new top */
+        SET_MAP_TOP (map, x, y, below);       /* we were top, set new top */
       /* Relink the object below us, if there is one */
-      if (op->below)
+      if (below)
-        op->below->above = op->above;
+        below->above = above;
       else
         {
           /* Nothing below, which means we need to relink map object for this space
            * use translated coordinates in case some oddness with map tiling is
            * evident
            */
-          if (GET_MAP_OB (m, x, y) != op)
+          if (GET_MAP_OB (map, x, y) != this)
             {
-              char *dump = dump_object (op);
+              char *dump = dump_object (this);
               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", dump);
               free (dump);
-              dump = dump_object (GET_MAP_OB (m, x, y));
+              dump = dump_object (GET_MAP_OB (map, x, y));
               LOG (llevError, "%s\n", dump);
               free (dump);
             }
-          SET_MAP_OB (m, x, y, op->above);      /* goes on above it. */
+          SET_MAP_OB (map, x, y, above);      /* goes on above it. */
         }
-      op->above = 0;
+      above = 0;
-      op->below = 0;
+      below = 0;
-      if (op->map->in_memory == MAP_SAVING)
+      if (map->in_memory == MAP_SAVING)
         return;
-      check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
+      check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
-      for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
+      for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
         {
           /* No point updating the players look faces if he is the object
            * being removed.
            */
-          if (tmp->type == PLAYER && tmp != op)
+          if (tmp->type == PLAYER && tmp != this)
             {
               /* If a container that the player is currently using somehow gets
                * removed (most likely destroyed), update the player view
                * appropriately.
                */
-              if (tmp->container == op)
+              if (tmp->container == this)
                 {
-                  CLEAR_FLAG (op, FLAG_APPLIED);
+                  CLEAR_FLAG (this, FLAG_APPLIED);
-                  tmp->container = NULL;
+                  tmp->container = 0;
                 }
               tmp->contr->socket.update_look = 1;
             }
           /* See if player moving off should effect something */
           if (check_walk_off
-              && ((op->move_type & tmp->move_off)
+              && ((move_type & tmp->move_off)
-                  && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
+                  && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
             {
-              move_apply (tmp, op, NULL);
+              move_apply (tmp, this, 0);
-              if (op->destroyed ())
+              if (destroyed ())
                 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)
-            tmp->above = NULL;
+            tmp->above = 0;
           last = tmp;
         }
       /* last == NULL of there are no objects on this space */
-      if (last == NULL)
+      if (!last)
         {
           /* set P_NEED_UPDATE, otherwise update_position will complain.  In theory,
            * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
            * those out anyways, and if there are any flags set right now, they won't
            * be correct anyways.
            */
-          SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
+          SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
-          update_position (op->map, op->x, op->y);
+          update_position (map, x, y);
         }
       else
         update_object (last, UP_OBJ_REMOVE);
-      if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
+      if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
-        update_all_los (op->map, op->x, op->y);
+        update_all_los (map, x, y);
     }
 }
 /*
  * merge_ob(op,top):
         {
           top->nrof += op->nrof;
 /*      CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
           op->weight = 0;       /* Don't want any adjustements now */
-          remove_ob (op);
+          op->remove ();
-          free_object (op);
+          op->destroy (0);
           return top;
         }
     }
   return 0;
   if (op->nrof && !(flag & INS_NO_MERGE))
     for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
       if (CAN_MERGE (op, tmp))
         {
           op->nrof += tmp->nrof;
-          remove_ob (tmp);
+          tmp->remove ();
-          free_object (tmp);
+          tmp->destroy (0);
         }
   CLEAR_FLAG (op, FLAG_APPLIED);        /* hack for fixing F_APPLIED in items of dead people */
   CLEAR_FLAG (op, FLAG_INV_LOCKED);
   for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
     {
       if (!strcmp (tmp->arch->name, arch_string))       /* same archetype */
         {
-          remove_ob (tmp);
+          tmp->remove ();
-          free_object (tmp);
+          tmp->destroy (0);
         }
     }
   tmp1 = arch_to_object (archetype::find (arch_string));
     }
   newob = object_create_clone (orig_ob);
   if ((orig_ob->nrof -= nr) < 1)
-    {
+    orig_ob->destroy (1);
-      if (!is_removed)
-        remove_ob (orig_ob);
-      free_object2 (orig_ob, 1);
-    }
   else if (!is_removed)
     {
       if (orig_ob->env != NULL)
         sub_weight (orig_ob->env, orig_ob->weight * nr);
       if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
               esrv_send_item (tmp, op);
             }
         }
       else
         {
-          remove_ob (op);
+          op->remove ();
           op->nrof = 0;
           if (tmp)
             {
               esrv_del_item (tmp->contr, op->count);
             }
       if (i < op->nrof)
         op->nrof -= i;
       else
         {
-          remove_ob (op);
+          op->remove ();
           op->nrof = 0;
         }
       /* Since we just removed op, op->above is null */
       for (tmp = above; tmp != NULL; tmp = tmp->above)
   if (op->nrof)
     return op;
   else
     {
-      free_object (op);
+      op->destroy (0);
       return NULL;
     }
 }
 /*
       op->carrying += weight;
       op = op->env;
     }
 }
-/*
- * insert_ob_in_ob(op,environment):
- *   This function inserts the object op in the linked list
- *   inside the object environment.
- *
- * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
- * the inventory at the last position or next to other objects of the same
- * type.
- * Frank: Now sorted by type, archetype and magic!
- *
- * The function returns now pointer to inserted item, and return value can
- * be != op, if items are merged. -Tero
- */
 object *
 insert_ob_in_ob (object *op, object *where)
 {
-  object *
+  if (!where)
-  tmp, *
-    otmp;
-  if (!QUERY_FLAG (op, FLAG_REMOVED))
-    {
-      char *dump = dump_object (op);
-      LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
-      free (dump);
-      return op;
-    }
-  if (where == NULL)
     {
       char *dump = dump_object (op);
       LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
       free (dump);
       return op;
     }
   if (where->head)
     {
-      LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
+      LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
       where = where->head;
     }
+  return where->insert (op);
+}
+/*
+ * env->insert (op)
+ *   This function inserts the object op in the linked list
+ *   inside the object environment.
+ *
+ * The function returns now pointer to inserted item, and return value can
+ * be != op, if items are merged. -Tero
+ */
+object *
+object::insert (object *op)
+{
+  object *tmp, *otmp;
+  if (!QUERY_FLAG (op, FLAG_REMOVED))
+    op->remove ();
   if (op->more)
     {
       LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
       return op;
   CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
   CLEAR_FLAG (op, FLAG_REMOVED);
   if (op->nrof)
     {
-      for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
+      for (tmp = inv; tmp != NULL; tmp = tmp->below)
         if (CAN_MERGE (tmp, op))
           {
             /* return the original object and remove inserted object
                (client needs the original object) */
             tmp->nrof += op->nrof;
             /* Weight handling gets pretty funky.  Since we are adding to
              * tmp->nrof, we need to increase the weight.
              */
-            add_weight (where, op->weight * op->nrof);
+            add_weight (this, op->weight * op->nrof);
             SET_FLAG (op, FLAG_REMOVED);
-            free_object (op);   /* free the inserted object */
+            op->destroy ();   /* free the inserted object */
             op = tmp;
-            remove_ob (op);     /* and fix old object's links */
+            op->remove ();     /* and fix old object's links */
             CLEAR_FLAG (op, FLAG_REMOVED);
             break;
           }
       /* I assume combined objects have no inventory
        * We add the weight - this object could have just been removed
        * (if it was possible to merge).  calling remove_ob will subtract
        * the weight, so we need to add it in again, since we actually do
        * the linking below
        */
-      add_weight (where, op->weight * op->nrof);
+      add_weight (this, op->weight * op->nrof);
     }
   else
-    add_weight (where, (op->weight + op->carrying));
+    add_weight (this, (op->weight + op->carrying));
-  otmp = is_player_inv (where);
+  otmp = is_player_inv (this);
-  if (otmp && otmp->contr != NULL)
+  if (otmp && otmp->contr)
-    {
-      if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
+    if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
-        fix_player (otmp);
+      fix_player (otmp);
-    }
   op->map = NULL;
-  op->env = where;
+  op->env = this;
   op->above = NULL;
   op->below = NULL;
   op->x = 0, op->y = 0;
   /* reset the light list and los of the players on the map */
-  if ((op->glow_radius != 0) && where->map)
+  if ((op->glow_radius != 0) && map)
     {
 #ifdef DEBUG_LIGHTS
       LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
 #endif /* DEBUG_LIGHTS */
-      if (MAP_DARKNESS (where->map))
+      if (MAP_DARKNESS (map))
-        update_all_los (where->map, where->x, where->y);
+        update_all_los (map, x, y);
     }
   /* Client has no idea of ordering so lets not bother ordering it here.
    * It sure simplifies this function...
    */
-  if (where->inv == NULL)
+  if (!inv)
-    where->inv = op;
+    inv = op;
   else
     {
-      op->below = where->inv;
+      op->below = inv;
       op->below->above = op;
-      where->inv = op;
+      inv = op;
     }
   return op;
 }
 /*
  * Checks if any objects has a move_type that matches objects
  * create clone from object to another
  */
 object *
 object_create_clone (object *asrc)
 {
-  object *
-    dst = NULL, *tmp, *src, *part, *prev, *item;
+  object *dst = 0, *tmp, *src, *part, *prev, *item;
   if (!asrc)
-    return NULL;
+    return 0;
   src = asrc;
   if (src->head)
     src = src->head;
-  prev = NULL;
+  prev = 0;
   for (part = src; part; part = part->more)
     {
       tmp = get_object ();
       copy_object (part, tmp);
       tmp->x -= src->x;
       tmp->y -= src->y;
       if (!part->head)
         {
           dst = tmp;
-          tmp->head = NULL;
+          tmp->head = 0;
         }
       else
         {
           tmp->head = dst;
         }
-      tmp->more = NULL;
+      tmp->more = 0;
       if (prev)
         prev->more = tmp;
       prev = tmp;
     }
   for (item = src->inv; item; item = item->below)
     insert_ob_in_ob (object_create_clone (item), dst);

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.58 by pippijn, Mon Dec 4 17:48:35 2006 UTC vs. Revision 1.63 by root, Tue Dec 12 20:53:02 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.58 by pippijn, Mon Dec 4 17:48:35 2006 UTC vs.
Revision 1.63 by root, Tue Dec 12 20:53:02 2006 UTC