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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.190 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.199 by root, Thu Nov 8 19:43:23 2007 UTC

 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
    sub/add_weight will transcend the environment updating the carrying
    variable. */
   /* This is really a spellbook check - really, we should
    * check all objects in the inventory.
    */
   if (ob1->inv || ob2->inv)
     {
-      /* if one object has inventory but the other doesn't, not equiv */
+      if (!(ob1->inv && ob2->inv))
-      if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
+        return 0; /* inventories differ in length */
-        return 0;
-      /* Now check to see if the two inventory objects could merge */
+      if (ob1->inv->below || ob2->inv->below)
+        return 0; /* more than one object in inv */
       if (!object::can_merge (ob1->inv, ob2->inv))
-        return 0;
+        return 0; /* inventory objexts differ */
       /* inventory ok - still need to check rest of this object to see
        * if it is valid.
        */
     }
     {
       ob1->optimise ();
       ob2->optimise ();
       if (ob1->self || ob2->self)
-        if (!cfperl_can_merge (ob1, ob2))
+        {
+          int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
+          int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
+          if (k1 != k2)
-          return 0;
+            return 0;
+          else if (k1 == 0)
+            return 1;
+          else if (!cfperl_can_merge (ob1, ob2))
+            return 0;
+        }
     }
   /* Everything passes, must be OK. */
   return 1;
 }
 {
   // allow objects which own objects
   if (owner)
     while (owner->owner)
       owner = owner->owner;
+  if (flag [FLAG_FREED])
+    {
+      LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
+      return;
+    }
   this->owner = owner;
 }
 int
 merge_ob (object *op, object *top)
 {
   if (!op->nrof)
     return 0;
-  if (top)
+  if (!top)
     for (top = op; top && top->above; top = top->above)
       ;
   for (; top; top = top->below)
     {
   else
     {
       top = ms.bot;
       /* If there are other objects, then */
-      if ((!(flag & INS_MAP_LOAD)) && top)
+      if (top)
         {
           object *last = 0;
           /*
            * If there are multiple objects on this space, we do some trickier handling.
                */
               if (last && last->below && last != floor)
                 top = last->below;
             }
         }                       /* If objects on this space */
-      if (flag & INS_MAP_LOAD)
-        top = ms.top;
       if (flag & INS_ABOVE_FLOOR_ONLY)
         top = floor;
       /* Top is the object that our object (op) is going to get inserted above.
       op->map->touch ();
     }
   op->map->dirty = true;
-  if (!(flag & INS_MAP_LOAD))
-    if (object *pl = ms.player ())
+  if (object *pl = ms.player ())
-      pl->contr->ns->floorbox_update ();
+    pl->contr->ns->floorbox_update ();
   /* If this object glows, it may affect lighting conditions that are
    * visible to others on this map.  But update_all_los is really
    * an inefficient way to do this, as it means los for all players
    * on the map will get recalculated.  The players could very well
  * activate recursively a flag on an object inventory
  */
 void
 flag_inv (object *op, int flag)
 {
-  if (op->inv)
-    for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
+  for (object *tmp = op->inv; tmp; tmp = tmp->below)
-      {
+    {
-        SET_FLAG (tmp, flag);
+      SET_FLAG (tmp, flag);
-        flag_inv (tmp, flag);
+      flag_inv (tmp, flag);
-      }
+    }
 }
 /*
  * deactivate recursively a flag on an object inventory
  */
 void
 unflag_inv (object *op, int flag)
 {
-  if (op->inv)
-    for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
+  for (object *tmp = op->inv; tmp; tmp = tmp->below)
-      {
+    {
-        CLEAR_FLAG (tmp, flag);
+      CLEAR_FLAG (tmp, flag);
-        unflag_inv (tmp, flag);
+      unflag_inv (tmp, flag);
-      }
+    }
 }
 /*
  * find_free_spot(object, map, x, y, start, stop) will search for
  * a spot at the given map and coordinates which will be able to contain
  * to search (see the freearr_x/y[] definition).
  * It returns a random choice among the alternatives found.
  * start and stop are where to start relative to the free_arr array (1,9
  * does all 4 immediate directions).  This returns the index into the
  * array of the free spot, -1 if no spot available (dir 0 = x,y)
- * Note - this only checks to see if there is space for the head of the
- * object - if it is a multispace object, this should be called for all
- * pieces.
- * Note2: This function does correctly handle tiled maps, but does not
+ * Note: This function does correctly handle tiled maps, but does not
  * inform the caller.  However, insert_ob_in_map will update as
  * necessary, so the caller shouldn't need to do any special work.
  * Note - updated to take an object instead of archetype - this is necessary
  * because arch_blocked (now ob_blocked) needs to know the movement type
  * to know if the space in question will block the object.  We can't use
       /* Note it is intentional that we check ob - the movement type of the
        * head of the object should correspond for the entire object.
        */
       if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
+        continue;
+      if (ob->blocked (m, pos.x, pos.y))
         continue;
       altern [index++] = i;
     }

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.190 by root, Sat Sep 15 15:58:06 2007 UTC vs. Revision 1.199 by root, Thu Nov 8 19:43:23 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.190 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.199 by root, Thu Nov 8 19:43:23 2007 UTC