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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.330 by root, Sun Apr 18 14:01:33 2010 UTC vs.
Revision 1.366 by root, Sat Nov 17 23:40:00 2018 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and 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 <support@deliantra.net>
  */
 #include <global.h>
 #include <stdio.h>
 uint32_t object::create_count;
 uint32_t object::destroy_count;
 //+GPL
-short freearr_x[SIZEOFFREE] = {
+int freearr_x[SIZEOFFREE] = {
    0,
    0,  1,  1,  1,  0, -1, -1, -1,
    0,  1,  2,  2,  2,  2,  2,  1,  0, -1, -2, -2, -2, -2, -2, -1,
    0,  1,  2,  3,  3,  3,  3,  3,  3,  3,  2,  1,  0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
 };
-short freearr_y[SIZEOFFREE] = {
+int freearr_y[SIZEOFFREE] = {
    0,
   -1, -1,  0,  1,  1,  1,  0, -1,
   -2, -2, -2, -1,  0,  1,  2,  2,  2,  2,  2,  1,  0, -1, -2, -2,
   -3, -3, -3, -3, -2, -1,  0,  1,  2,  3,  3,  3,  3,  3,  3,  3,  2,  1,  0, -1, -2, -3, -3, -3
 };
    9, 10, 13, 14, 17, 18, 21, 22,
   25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
   49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
 };
+const char *wall_suffix[16] = {
+  "0",
+  "1_3",
+  "1_4",
+  "2_1_2",
+  "1_2",
+  "2_2_4",
+  "2_2_1",
+  "3_1",
+  "1_1",
+  "2_2_3",
+  "2_2_2",
+  "3_3",
+  "2_1_1",
+  "3_4",
+  "3_2",
+  "4"
+};
 static void
 write_uuid (uval64 skip, bool sync)
 {
   CALL_BEGIN (2);
   CALL_ARG_SV (newSVval64 (skip));
 /* Returns TRUE if every key_values in wants has a partner with the same value in has. */
 static bool
 compare_ob_value_lists_one (const object *wants, const object *has)
 {
-  /* n-squared behaviour (see kv_get), but I'm hoping both
+  /* n-squared behaviour (see kv.get), but I'm hoping both
    * objects with lists are rare, and lists stay short. If not, use a
    * different structure or at least keep the lists sorted...
    */
   /* For each field in wants, */
-  for (key_value *kv = wants->key_values; kv; kv = kv->next)
+  for (key_value *kv = wants->kv.first; kv; kv = kv->next)
-    if (has->kv_get (kv->key) != kv->value)
+    if (has->kv.get (kv->key) != kv->value)
       return false;
   /* If we get here, every field in wants has a matching field in has. */
   return true;
 }
  */
 bool object::can_merge_slow (object *ob1, object *ob2)
 {
   /* A couple quick sanity checks */
   if (ob1 == ob2
-      || ob1->type  != ob2->type
+      || ob1->type        != ob2->type
-      || ob1->value != ob2->value
+      || ob1->value       != ob2->value
-      || ob1->name  != ob2->name
+      || ob1->name        != ob2->name
+      || ob1->custom_name != ob2->custom_name
       || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
     return 0;
   /* Do not merge objects if nrof would overflow, assume nrof
    * is always 0 .. 2**31-1 */
       /* inventory ok - still need to check rest of this object to see
        * if it is valid.
        */
     }
-  /* Don't merge objects that are applied.  With the new 'body' code,
+  /* Don't merge objects that are applied. With the new 'body' code,
    * it is possible for most any character to have more than one of
    * some items equipped, and we don't want those to merge.
    */
   if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
     return 0;
-  /* Note sure why the following is the case - either the object has to
+  /* Not sure why the following is the case - either the object has to
-   * be animated or have a very low speed.  Is this an attempted monster
+   * be animated or have a very low speed. Is this an attempted monster
    * check?
    */
   if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
     return 0;
         if (ob1->level != ob2->level)
           return 0;
         break;
     }
-  if (ob1->key_values || ob2->key_values)
+  if (!ob1->kv.empty () || !ob2->kv.empty ())
     {
       /* At least one of these has key_values. */
-      if ((!ob1->key_values) != (!ob2->key_values))
+      if (ob1->kv.empty () != ob2->kv.empty ())
         return 0; /* One has fields, but the other one doesn't. */
       if (!compare_ob_value_lists (ob1, ob2))
         return 0;
     }
   return 0;
 }
 // adjust weight per container type ("of holding")
-static sint32
+static weight_t
-weight_adjust_for (object *op, sint32 weight)
+weight_adjust_for (object *op, weight_t weight)
 {
-  return op->type == CONTAINER
+  if (op->type == CONTAINER)
-         ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
+    weight -= weight * op->stats.Str / 100;
-         : weight;
-}
+  return weight;
+}
 /*
- * adjust_weight(object, weight) adds the specified weight to an object,
+ * subtracts, then adds, the specified weight to an object,
  * and also updates how much the environment(s) is/are carrying.
  */
 static void
-adjust_weight (object *op, sint32 weight)
+adjust_weight (object *op, weight_t sub, weight_t add)
 {
   while (op)
     {
-      // adjust by actual difference to account for rounding errors
+      weight_t carrying = (weight_t)op->carrying
-      // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
+                          - weight_adjust_for (op, sub)
-      weight = weight_adjust_for (op, op->carrying)
+                          + weight_adjust_for (op, add);
-             - weight_adjust_for (op, op->carrying - weight);
-      if (!weight)
+      sub = op->carrying;
-        return;
-      op->carrying += weight;
+      op->carrying = carrying;
+      add = op->carrying;
       if (object *pl = op->visible_to ())
         if (pl != op) // player is handled lazily
           esrv_update_item (UPD_WEIGHT, pl, op);
  * containers are carrying, and sums it up.
  */
 void
 object::update_weight ()
 {
-  sint32 sum = 0;
+  weight_t sum = 0;
   for (object *op = inv; op; op = op->below)
     {
-      if (op->inv)
-        op->update_weight ();
+      op->update_weight ();
-      sum += op->total_weight ();
+      sum += weight_adjust_for (this, op->total_weight ());
     }
-  sum = weight_adjust_for (this, sum);
   if (sum != carrying)
     {
-      if (carrying != sum)//D
+      if (carrying != sum && carrying)//D
-        LOG (llevDebug, "updating weight got %ld, expected %ld (%s)\n",
+        LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
              (long long)sum, (long long)carrying, debug_desc ());
       carrying = sum;
       if (object *pl = visible_to ())
       LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
       return;
     }
   this->owner = owner;
-}
-/* Zero the key_values on op, decrementing the shared-string
- * refcounts and freeing the links.
- */
-static void
-free_key_values (object *op)
-{
-  for (key_value *i = op->key_values; i; )
-    {
-      key_value *next = i->next;
-      delete i;
-      i = next;
-    }
-  op->key_values = 0;
 }
 /*
  * copy_to first frees everything allocated by the dst object,
  * and then copies the contents of itself into the second
 void
 object::copy_to (object *dst)
 {
   dst->remove ();
   *(object_copy *)dst = *this;
+  // maybe move to object_copy?
+  dst->kv = kv;
   dst->flag [FLAG_REMOVED] = true;
-  /* Copy over key_values, if any. */
-  if (key_values)
-    {
-      key_value *tail = 0;
-      dst->key_values = 0;
-      for (key_value *i = 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)
-            {
-              dst->key_values = new_link;
-              tail = new_link;
-            }
-          else
-            {
-              tail->next = new_link;
-              tail = new_link;
-            }
-        }
-    }
   dst->activate ();
 }
 void
 object::instantiate ()
 {
   if (!uuid.seq) // HACK
     uuid = UUID::gen ();
-  // TODO: unclean state changes, should nt be done in copy_to AND instantiate
+  // TODO: unclean state changes, should not be done in copy_to AND instantiate
   if (flag [FLAG_RANDOM_SPEED] && speed)
     speed_left = - speed - rndm (); // TODO animation
   else
     speed_left = -1.;
   /* 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.
    */
-  for (int i = NUM_BODY_LOCATIONS; i--; )
+  for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
     slot[i].used = slot[i].info;
   attachable::instantiate ();
 }
     }
   mapspace &m = op->ms ();
   if (!(m.flags_ & P_UPTODATE))
-    /* nop */;
+    m.update_up (); // nothing to do except copy up
   else if (action == UP_OBJ_INSERT)
     {
 #if 0
       // this is likely overkill, TODO: revisit (schmorp)
       if ((op->flag [FLAG_BLOCKSVIEW]  && !(m.flags_ & P_BLOCKSVIEW))
           || (op->flag [FLAG_DAMNED]   && !(m.flags_ & P_NO_CLERIC))
           || (m.move_on   | op->move_on  ) != m.move_on
           || (m.move_off  | op->move_off ) != m.move_off
           || (m.move_slow | op->move_slow) != m.move_slow
           /* This isn't perfect, but I don't expect a lot of objects to
            * have move_allow right now.
            */
           || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
         m.invalidate ();
 #else
       // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
      * that is being removed.
      */
   else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
     m.invalidate ();
   else if (action == UP_OBJ_FACE)
-    /* Nothing to do for that case */ ;
+    m.update_up (); // nothing to do for that case, except copy up
   else
     LOG (llevError, "update_object called with invalid action: %d\n", action);
   if (op->more)
     update_object (op->more, action);
 object::~object ()
 {
   unlink ();
-  free_key_values (this);
+  kv.clear ();
 }
 void object::link ()
 {
   assert (!index);//D
     op->activate_recursive ();
 }
 /* This function removes object 'op' from the list of active
  * objects.
  * This should only be used for style maps or other such
  * reference maps where you don't want an object that isn't
  * in play chewing up cpu time getting processed.
  * The reverse of this is to call update_ob_speed, which
  * will do the right thing based on the speed of the object.
  */
    * if some form of movement is allowed, let objects
    * drop on that space.
    */
   if (!drop_to_ground
       || !map
-      || map->in_memory != MAP_ACTIVE
+      || !map->linkable ()
       || map->no_drop
       || ms ().move_block == MOVE_ALL)
     {
       while (inv)
         inv->destroy ();
   freelist = li;
   ++free_count;
 }
-static struct freed_map : maptile
-{
-  freed_map ()
-  : maptile (3, 3)
-  {
-    path     = "<freed objects map>";
-    name     = "/internal/freed_objects_map";
-    no_drop  = 1;
-    no_reset = 1;
-    in_memory = MAP_ACTIVE;
-  }
-  ~freed_map ()
-  {
-    destroy ();
-  }
-} freed_map; // freed objects are moved here to avoid crashes
 void
 object::do_destroy ()
 {
   if (flag [FLAG_IS_LINKED])
     remove_link ();
   flag [FLAG_REMOVED] = true;
   if (more)
     more->remove ();
   /*
    * In this case, the object to be removed is in someones
    * inventory.
    */
   if (env)
     {
       flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
       if (object *pl = visible_to ())
         esrv_del_item (pl->contr, count);
       flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
-      adjust_weight (env, -total_weight ());
+      adjust_weight (env, total_weight (), 0);
       object *pl = in_player ();
       /* we set up values so that it could be inserted into
        * the map, but we don't actually do that - it is up
       if (pl && pl->is_player ())
         {
           if (expect_false (pl->contr->combat_ob == this))
             {
-              pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
+              pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
               pl->contr->combat_ob = 0;
               if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
             }
           if (expect_false (pl->contr->ranged_ob == this))
             {
-              pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
+              pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
               pl->contr->ranged_ob = 0;
               if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
             }
           pl->contr->queue_stats_update ();
       above = 0;
       below = 0;
       ms.invalidate ();
-      if (map->in_memory == MAP_SAVING)
-        return;
       int check_walk_off = !flag [FLAG_NO_APPLY];
       if (object *pl = ms.player ())
         {
 {
   op->remove ();
   if (m == &freed_map)//D TODO: remove soon
     {//D
-      LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
+      LOG (llevError | logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D
     }//D
   /* Ideally, the caller figures this out.  However, it complicates a lot
    * of areas of callers (eg, anything that uses find_free_spot would now
    * need extra work
            * We've already dealt with merging if appropriate.
            * Generally, we want to put the new object on top. But if
            * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
            * floor, we want to insert above that and no further.
            * Also, if there are spell objects on this space, we stop processing
            * once we get to them.  This reduces the need to traverse over all of
            * them when adding another one - this saves quite a bit of cpu time
            * when lots of spells are cast in one area.  Currently, it is presumed
            * that flying non pickable objects are spell objects.
            */
           for (object *tmp = ms.bot; tmp; tmp = tmp->above)
    */
   /* if this is not the head or flag has been passed, don't check walk on status */
   if (!(flag & INS_NO_WALK_ON) && op->is_head ())
     {
-      if (check_move_on (op, originator))
+      if (check_move_on (op, originator, flag))
         return 0;
-      /* If we are a multi part object, lets work our way through the check
+      /* If we are a multi part object, let's work our way through the check
        * walk on's.
        */
       for (object *tmp = op->more; tmp; tmp = tmp->more)
-        if (check_move_on (tmp, originator))
+        if (check_move_on (tmp, originator, flag))
           return 0;
     }
   return op;
 }
 /* this function inserts an object in the map, but if it
  * finds an object of its own type, it'll remove that one first.
  * op is the object to insert it under: supplies x and the map.
  */
 void
 replace_insert_ob_in_map (shstr_tmp archname, object *op)
 {
   if (!items // testing !items ensures we can drop at least one item
       || (items < m->max_items
           && ms.volume () < m->max_volume))
     return true;
-  if (originator && originator->is_player ())
+  if (originator)
-    originator->contr->failmsgf (
+    originator->failmsgf (
-       "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
+       "No matter how hard you try, you just cannot put the %s here! H<Try to remove some items from the floor first.>",
        query_name ()
     );
   return false;
 }
   nr = min (nr, nrof);
   if (nrof > nr)
     {
+      weight_t oweight = total_weight ();
       nrof -= nr;
-      adjust_weight (env, -weight * max (1, nr)); // carrying == 0
       if (object *pl = visible_to ())
         esrv_update_item (UPD_NROF, pl, this);
+      adjust_weight (env, oweight, total_weight ());
       return true;
     }
   else
     {
 /*
  * 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)
 {
   if (op->nrof)
     for (object *tmp = inv; tmp; tmp = tmp->below)
       if (object::can_merge (tmp, op))
         {
           /* return the original object and remove inserted object
-             (client needs the original object) */
+             (client prefers the original object) */
+          // carrying must be 0 for mergable objects
+          weight_t oweight = weight_t (tmp->weight) * tmp->nrof;
           tmp->nrof += op->nrof;
           if (object *pl = tmp->visible_to ())
             esrv_update_item (UPD_NROF, pl, tmp);
-          adjust_weight (this, op->total_weight ());
+          adjust_weight (this, oweight, weight_t (tmp->weight) * tmp->nrof);
           op->destroy ();
           op = tmp;
           goto inserted;
         }
   op->flag [FLAG_REMOVED] = 0;
   if (object *pl = op->visible_to ())
     esrv_send_item (pl, op);
-  adjust_weight (this, op->total_weight ());
+  adjust_weight (this, 0, op->total_weight ());
 inserted:
   /* reset the light list and los of the players on the map */
   if (op->glow_radius && is_on_map ())
     {
  * MSW 2001-07-08: Check all objects on space, not just those below
  * object being inserted.  insert_ob_in_map may not put new objects
  * on top.
  */
 int
-check_move_on (object *op, object *originator)
+check_move_on (object *op, object *originator, int flags)
 {
   if (op->flag [FLAG_NO_APPLY])
     return 0;
   object *tmp;
    */
   if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0)
     return 0;
   /* The objects have to be checked from top to bottom.
    * Hence, we first go to the top:
    */
   for (object *next, *tmp = ms.top; tmp; tmp = next)
     {
       next = tmp->below;
       /* Basically same logic as above, except now for actual apply. */
       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))
         {
+          if ((flags & INS_NO_AUTO_EXIT)
+              && (tmp->type == EXIT || tmp->type == TELEPORTER
+                  || tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
+            continue;
           move_apply (tmp, op, originator);
           if (op->destroyed ())
             return 1;
  * 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
  * the archetype because that isn't correct if the monster has been
  * customized, changed states, etc.
  */
 int
 find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
 {
   int altern[SIZEOFFREE];
-  int index = 0, flag;
+  int index = 0;
   for (int i = start; i < stop; i++)
     {
       mapxy pos (m, x, y); pos.move (i);
           continue;
         }
       /* Basically, if we find a wall on a space, we cut down the search size.
        * In this way, we won't return spaces that are on another side of a wall.
        * This mostly work, but it cuts down the search size in all directions -
        * if the space being examined only has a wall to the north and empty
        * spaces in all the other directions, this will reduce the search space
        * to only the spaces immediately surrounding the target area, and
        * won't look 2 spaces south of the target space.
        */
  */
 int
 find_first_free_spot (const object *ob, maptile *m, int x, int y)
 {
   for (int i = 0; i < SIZEOFFREE; i++)
-    if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
+    if (!ob->blocked (m, x + DIRX (i), y + DIRY (i)))
       return i;
   return -1;
 }
   while (--end)
     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
  * monsters to the north first.  However, the size of the array passed
  * covers all the spaces, so within that size, all the spaces within
  * the 3x3 area will be searched, just not in a predictable order.
  * there is capable of.
  */
 int
 find_dir (maptile *m, int x, int y, object *exclude)
 {
-  int max = SIZEOFFREE, mflags;
+  int max = SIZEOFFREE;
   MoveType move_type;
   if (exclude && exclude->head_ () != exclude)
     {
       exclude = exclude->head;
 #if 1 // new algorithm
   // this works by putting x, y into 16 sectors, which
   // are not equal sized, but are a better approximation
   // then the old algorithm, and then using a mapping
   // table to map it into a direction value.
+  // basically, it maps these comparisons to each bit
+  // bit #3: x < 0
+  // bit #2: y < 0
+  // bit #1: x > y
+  // bit #0: x > 2y
   static const uint8 dir[16] = {
      4,  5,  4,  3,
      2,  1,  2,  3,
      6,  5,  6,  7,
   int mflags;
   if (dir < 0)
     return 0;                   /* exit condition:  invalid direction */
-  dx = x + freearr_x[dir];
+  dx = x + DIRX (dir);
-  dy = y + freearr_y[dir];
+  dy = y + DIRY (dir);
   mflags = get_map_flags (m, &m, dx, dy, &dx, &dy);
   /* This functional arguably was incorrect before - it was
    * checking for P_WALL - that was basically seeing if
   return                        /*who->flag [FLAG_WIZ]|| */
     (item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
      !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
 }
+//-GPL
 /*
  * create clone from object to another
  */
 object *
 object::deep_clone ()
       return tmp;
   return 0;
 }
+/* Zero the key_values on op, decrementing the shared-string
+ * refcounts and freeing the links.
+ */
+void
+key_values::clear ()
+{
+  for (key_value *kvp = first; kvp; )
+    {
+      key_value *next = kvp->next;
+      delete kvp;
+      kvp = next;
+    }
+  first = 0;
+}
 shstr_tmp
-object::kv_get (shstr_tmp key) const
+key_values::get (shstr_tmp key) const
 {
-  for (key_value *kv = key_values; kv; kv = kv->next)
+  for (key_value *kv = first; kv; kv = kv->next)
     if (kv->key == key)
       return kv->value;
   return shstr ();
 }
 void
+key_values::add (shstr_tmp key, shstr_tmp value)
+{
+  key_value *kv = new key_value;
+  kv->next  = first;
+  kv->key   = key;
+  kv->value = value;
+  first = kv;
+}
+void
-object::kv_set (shstr_tmp key, shstr_tmp value)
+key_values::set (shstr_tmp key, shstr_tmp value)
 {
-  for (key_value *kv = key_values; kv; kv = kv->next)
+  for (key_value *kv = first; kv; kv = kv->next)
     if (kv->key == key)
       {
         kv->value = value;
         return;
       }
-  key_value *kv = new key_value;
+  add (key, value);
-  kv->next  = key_values;
-  kv->key   = key;
-  kv->value = value;
-  key_values = kv;
 }
 void
-object::kv_del (shstr_tmp key)
+key_values::del (shstr_tmp key)
 {
-  for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
+  for (key_value **kvp = &first; *kvp; kvp = &(*kvp)->next)
     if ((*kvp)->key == key)
       {
         key_value *kv = *kvp;
         *kvp = (*kvp)->next;
         delete kv;
         return;
       }
+}
+void
+key_values::reverse ()
+{
+  key_value *prev = 0;
+  key_value *head = first;
+  while (head)
+    {
+      key_value *node = head;
+      head = head->next;
+      node->next = prev;
+      prev = node;
+    }
+  first = prev;
+}
+key_values &
+key_values::operator =(const key_values &kv)
+{
+  clear ();
+  for (key_value *kvp = kv.first; kvp; kvp = kvp->next)
+    add (kvp->key, kvp->value);
+  reverse ();
 }
 object::depth_iterator::depth_iterator (object *container)
 : iterator_base (container)
 {
 object::region () const
 {
   return map ? map->region (x, y)
              : region::default_region ();
 }
+//+GPL
 void
 object::open_container (object *new_container)
 {
   if (container == new_container)
     }
 //  else if (!old_container->env && contr && contr->ns)
 //    contr->ns->floorbox_reset ();
 }
+//-GPL
+// prefetch some flat area around the player
+static void
+prefetch_surrounding_area (object *op, maptile *map, int range)
+{
+  for (maprect *rect = map->split_to_tiles (mapwalk_buf,
+                          op->x - range    , op->y - range    ,
+                          op->x + range + 1, op->y + range + 1);
+       rect->m;
+       ++rect)
+    {
+      rect->m->touch ();
+      rect->m->activate ();
+    }
+}
+// prefetch a generous area around the player, also up and down
+void
+object::prefetch_surrounding_maps ()
+{
+  prefetch_surrounding_area (this, map, 40);
+  if (maptile *m = map->tile_available (TILE_DOWN))
+    prefetch_surrounding_area (this, m, 20);
+  if (maptile *m = map->tile_available (TILE_UP))
+    prefetch_surrounding_area (this, m, 20);
+}
+//+GPL
 object *
 object::force_find (shstr_tmp name)
 {
   /* cycle through his inventory to look for the MARK we want to
    * place
    */
   for (object *tmp = inv; tmp; tmp = tmp->below)
     if (tmp->type == FORCE && tmp->slaying == name)
       return splay (tmp);
   return 0;
 }
-//-GPL
 void
 object::force_set_timer (int duration)
 {
   this->duration   = 1;
   this->speed_left = -1.f;
 object::force_add (shstr_tmp name, int duration)
 {
   if (object *force = force_find (name))
     force->destroy ();
-  object *force = get_archetype (FORCE_NAME);
+  object *force = archetype::get (FORCE_NAME);
   force->slaying = name;
   force->force_set_timer (duration);
   force->flag [FLAG_APPLIED] = true;
     return contr->mark;
   else
     return 0;
 }
+// put marked object first in the inventory
+// this is used by identify-like spells so players can influence
+// the order a bit.
+void
+object::splay_marked ()
+{
+  if (object *marked = mark ())
+    splay (marked);
+}

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.330 by root, Sun Apr 18 14:01:33 2010 UTC vs. Revision 1.366 by root, Sat Nov 17 23:40:00 2018 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.330 by root, Sun Apr 18 14:01:33 2010 UTC vs.
Revision 1.366 by root, Sat Nov 17 23:40:00 2018 UTC