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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.290 by sf-marcmagus, Sun Oct 11 05:43:35 2009 UTC vs.
Revision 1.322 by root, Sun Apr 11 00:34:05 2010 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 1992 Frank Tore Johansen
  *
- * Deliantra is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * 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 GNU General Public License
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 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>
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <object.h>
 #include <sproto.h>
-#include <loader.h>
 #include <bitset>
 UUID UUID::cur;
 static uint64_t seq_next_save;
 static const uint64 UUID_GAP = 1<<19;
 uint32_t mapspace::smellcount = 10000;
 objectvec objects;
 activevec actives;
+//+GPL
 short 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, -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
 };
-int maxfree[SIZEOFFREE] = {
-   0,
-   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
-};
 int freedir[SIZEOFFREE] = {
    0,
    1,  2,  3,  4,  5,  6,  7,  8,
    1,  2,  2,  2,  3,  4,  4,  4,  5,  6,  6,  6,  7,  8,  8,  8,
    1,  2,  2,  2,  2,  2,  3,  4,  4,  4,  4,  4,  5,  6,  6,  6,  6,  6,  7,  8,  8,  8,  8,  8
 };
+static int maxfree[SIZEOFFREE] = {
+   0,
+   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
+};
 static void
 write_uuid (uval64 skip, bool sync)
 {
   CALL_BEGIN (2);
   CALL_ARG_SV (newSVval64 (skip));
   CALL_CALL ("cf::write_uuid", G_DISCARD);
   CALL_END;
 }
 static void
-read_uuid (void)
+read_uuid ()
 {
   char filename[MAX_BUF];
   sprintf (filename, "%s/uuid", settings.localdir);
       LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
       _exit (1);
     }
-  UUID::BUF buf;
+  char buf [UUID::MAX_LEN];
   buf[0] = 0;
   fgets (buf, sizeof (buf), fp);
   if (!UUID::cur.parse (buf))
     {
 void
 UUID::init ()
 {
   read_uuid ();
+}
+bool
+UUID::parse (const char *s)
+{
+  if (*s++ != '<' || *s++ != '1' || *s++ != '.')
+    return false;
+  seq = 0;
+  while (*s != '>')
+    {
+      if (*s < '0')
+        return false;
+      // this gives nice branchless code with gcc
+      assert ('0' < 'a' && '0' == 48 && 'a' == 97);
+      int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
+      seq = (seq << 4) | digit;
+      ++s;
+    }
+  return true;
+}
+char *
+UUID::append (char *buf) const
+{
+  *buf++ = '<';
+  *buf++ = '1';
+  *buf++ = '.';
+  uint64_t seq = this->seq;
+  const int bits = 64;
+  char nz = 0;
+  static const char tohex [] = "0123456789abcdef";
+  // assert (len >= 3 + bits / 4 + 1 + 1);
+  for (int i = bits / 4; --i; )
+    {
+      uint8_t digit = seq >> (bits - 4);
+      *buf = tohex [digit];
+      nz |= digit;
+      buf += nz ? 1 : 0;
+      seq <<= 4;
+    }
+  // last digit is special - always emit
+  uint8_t digit = seq >> (bits - 4);
+  *buf++ = tohex [digit];
+  *buf++ = '>';
+  return buf;
+}
+char *
+UUID::c_str () const
+{
+  static char buf [MAX_LEN];
+  *append (buf) = 0;
+  return buf;
 }
 /* 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)
  * Improvements made with merge:  Better checking on potion, and also
  * check weight
  */
 bool object::can_merge_slow (object *ob1, object *ob2)
 {
-  /* A couple quicksanity checks */
+  /* A couple quick sanity checks */
   if (ob1 == ob2
       || ob1->type  != ob2->type
-      || ob1->speed != ob2->speed
       || ob1->value != ob2->value
-      || ob1->name  != ob2->name)
+      || ob1->name  != ob2->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 */
   if (ob1->nrof > 0x7fffffff - ob2->nrof)
    * This is to the comparison of the flags below will be OK. We
    * just can't ignore the been applied or identified flags, as they
    * are not equal - just if it has been identified, the been_applied
    * flags lose any meaning.
    */
-  if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
+  if (ob1->flag [FLAG_IDENTIFIED])
-    SET_FLAG (ob1, FLAG_BEEN_APPLIED);
+    ob1->set_flag (FLAG_BEEN_APPLIED);
-  if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
+  if (ob2->flag [FLAG_IDENTIFIED])
-    SET_FLAG (ob2, FLAG_BEEN_APPLIED);
+    ob2->set_flag (FLAG_BEEN_APPLIED);
   if (ob1->arch->archname  != ob2->arch->archname
       || ob1->name         != ob2->name
       || ob1->title        != ob2->title
       || ob1->msg          != ob2->msg
       || ob1->magic        != ob2->magic
       || ob1->slaying      != ob2->slaying
       || ob1->skill        != ob2->skill
       || ob1->value        != ob2->value
       || ob1->animation_id != ob2->animation_id
-      || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
+      || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
       || ob1->client_type  != ob2->client_type
-      || ob1->materialname != ob2->materialname
+      || ob1->material     != ob2->material
       || ob1->lore         != ob2->lore
       || ob1->subtype      != ob2->subtype
       || ob1->move_type    != ob2->move_type
       || ob1->move_block   != ob2->move_block
       || ob1->move_allow   != ob2->move_allow
       || ob1->move_on      != ob2->move_on
       || ob1->move_off     != ob2->move_off
       || ob1->move_slow    != ob2->move_slow
-      || ob1->move_slow_penalty != ob2->move_slow_penalty
+      || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
       || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
       || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
     return 0;
   if ((ob1->flag ^ ob2->flag)
   /* 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 (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))
+  if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
     return 0;
   /* Note 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
    * check?
    */
-  if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
+  if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
     return 0;
   switch (ob1->type)
     {
       case SCROLL:
           // the player itself is always on a map, so we will find him here
           // even if our inv is in a player.
           if (envest->is_on_map ())
             if (object *pl = envest->ms ().player ())
-              if (pl->container == env)
+              if (pl->container_ () == env)
                 return pl;
         }
       else
         {
           // maybe there is a player standing on the same mapspace
           // this will catch the case where "this" is a player
           if (object *pl = ms ().player ())
-            if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
+            if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
-                || this == pl->container)
+                || pl->container_ () == this)
               return pl;
         }
     }
   return 0;
 {
   return dump_object (this);
 }
 /*
- * get_nearest_part(multi-object, object 2) returns the part of the
- * multi-object 1 which is closest to the second object.
- * If it's not a multi-object, it is returned.
- */
-object *
-get_nearest_part (object *op, const object *pl)
-{
-  object *tmp, *closest;
-  int last_dist, i;
-  if (!op->more)
-    return op;
-  for (last_dist = distance (op, pl), closest = op, tmp = op->more;
-       tmp;
-       tmp = tmp->more)
-    if ((i = distance (tmp, pl)) < last_dist)
-      closest = tmp, last_dist = i;
-  return closest;
-}
-/*
  * Returns the object which has the count-variable equal to the argument.
  * VERRRY slow.
  */
 object *
 find_object (tag_t i)
 {
   for_all_objects (op)
    if (op->count == i)
+     return op;
+  return 0;
+}
+/*
+ * Returns the object which has the uuid equal to the argument.
+ * MOAR VERRRY slow.
+ */
+object *
+find_object_uuid (UUID i)
+{
+  for_all_objects (op)
+   if (op->uuid == i)
      return op;
   return 0;
 }
       LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
       return;
     }
   this->owner = owner;
-}
-int
-object::slottype () const
-{
-  if (type == SKILL)
-    {
-      if (IS_COMBAT_SKILL (subtype)) return slot_combat;
-      if (IS_RANGED_SKILL (subtype)) return slot_ranged;
-    }
-  else
-    {
-      if (slot [body_combat].info) return slot_combat;
-      if (slot [body_range ].info) return slot_ranged;
-    }
-  return slot_none;
-}
-bool
-object::change_weapon (object *ob)
-{
-  if (current_weapon == ob)
-    return true;
-  if (chosen_skill)
-    chosen_skill->flag [FLAG_APPLIED] = false;
-  current_weapon = ob;
-  chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
-  if (chosen_skill)
-    chosen_skill->flag [FLAG_APPLIED] = true;
-  update_stats ();
-  if (ob)
-    {
-      // now check wether any body locations became invalid, in which case
-      // we cannot apply the weapon at the moment.
-      for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
-        if (slot[i].used < 0)
-          {
-            current_weapon = chosen_skill = 0;
-            update_stats ();
-            new_draw_info_format (NDI_UNIQUE, 0, this,
-                                  "You try to balance all your items at once, "
-                                  "but the %s is just too much for your body. "
-                                  "[You need to unapply some items first - use the 'body' command to see "
-                                  "how many items you cna wera on a specific body part.]", &ob->name);
-            return false;
-          }
-      //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
-    }
-  else
-    ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
-  if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
-    {
-      LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
-           &name, ob->debug_desc ());
-      return false;
-    }
-  return true;
 }
 /* Zero the key_values on op, decrementing the shared-string
  * refcounts and freeing the links.
  */
               tail = new_link;
             }
         }
     }
-  if (speed < 0)
-    dst->speed_left -= rndm ();
   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
+  if (flag [FLAG_RANDOM_SPEED] && speed)
+    speed_left = - speed - rndm (); // TODO animation
+  else
-  speed_left = -0.1f;
+    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.
 object *
 object::clone ()
 {
   object *neu = create ();
   copy_to (neu);
+  // TODO: unclean state changes, should not be done in clone AND instantiate
+  if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
+    neu->speed_left = - neu->speed - rndm (); // TODO animation
   neu->map = map; // not copied by copy_to
   return neu;
 }
 /*
  * be called to update the face variable, _and_ how it looks on the map.
  */
 void
 update_turn_face (object *op)
 {
-  if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
+  if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
     return;
   SET_ANIMATION (op, op->direction);
   update_object (op, UP_OBJ_FACE);
 }
  * This function needs to be called whenever the speed of an object changes.
  */
 void
 object::set_speed (float speed)
 {
-  if (flag [FLAG_FREED] && speed)
-    {
-      LOG (llevError, "Object %s is freed but has speed.\n", &name);
-      speed = 0;
-    }
   this->speed = speed;
   if (has_active_speed ())
     activate ();
   else
   if (!(m.flags_ & P_UPTODATE))
     /* nop */;
   else if (action == UP_OBJ_INSERT)
     {
+#if 0
       // this is likely overkill, TODO: revisit (schmorp)
-      if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW)  && !(m.flags_ & P_BLOCKSVIEW))
+      if ((op->flag [FLAG_BLOCKSVIEW]  && !(m.flags_ & P_BLOCKSVIEW))
-          || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
+          || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
           || (op->is_player ()               && !(m.flags_ & P_PLAYER))
           || (op->type == SAFE_GROUND        && !(m.flags_ & P_SAFE))
-          || (QUERY_FLAG (op, FLAG_ALIVE)    && !(m.flags_ & P_IS_ALIVE))
+          || (op->flag [FLAG_ALIVE]    && !(m.flags_ & P_IS_ALIVE))
-          || (QUERY_FLAG (op, FLAG_DAMNED)   && !(m.flags_ & P_NO_CLERIC))
+          || (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
-          || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
         m.invalidate ();
+#else
+      // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
+      m.invalidate ();
+#endif
     }
     /* 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.
      */
     update_object (op->more, action);
 }
 object::object ()
 {
-  SET_FLAG (this, FLAG_REMOVED);
+  this->set_flag (FLAG_REMOVED);
   //expmul = 1.0; declared const for the time being
-  face = blank_face;
+  face     = blank_face;
+  material = MATERIAL_NULL;
 }
 object::~object ()
 {
   unlink ();
             map->insert (op, x, y);
         }
     }
 }
+/*
+ * Remove and free all objects in the inventory of the given object.
+ * Unlike destroy_inv, this assumes the *this is destroyed as well
+ * well, so we can (and have to!) take shortcuts.
+ */
+void
+object::destroy_inv_fast ()
+{
+  while (object *op = inv)
+    {
+      // remove from object the fast way
+      op->flag [FLAG_REMOVED] = true;
+      op->env = 0;
+      if ((inv = inv->below))
+        inv->above = 0;
+      // then destroy
+      op->destroy ();
+    }
+}
 object *object::create ()
 {
   object *op = new object;
   op->link ();
   return op;
       LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
       head->destroy ();
       return;
     }
-  destroy_inv (false);
+  destroy_inv_fast ();
   if (is_head ())
     if (sound_destroy)
       play_sound (sound_destroy);
     else if (flag [FLAG_MONSTER])
  *   the previous environment.
  */
 void
 object::do_remove ()
 {
-  object *tmp, *last = 0;
-  object *otmp;
   if (flag [FLAG_REMOVED])
     return;
   INVOKE_OBJECT (REMOVE, this);
       above = 0;
       below = 0;
       env   = 0;
-      /* NO_FIX_PLAYER is set when a great many changes are being
+      if (pl && pl->is_player ())
-       * made to players inventory.  If set, avoiding the call
-       * to save cpu time.
-       */
+        {
-      if (pl)
+          if (expect_false (pl->contr->combat_ob == this))
-        if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
-          {
+            {
-            pl->update_stats ();
+              pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
+              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->contr->ranged_ob = 0;
+              if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
+            }
+          pl->contr->queue_stats_update ();
-            if (glow_radius && pl->is_on_map ())
+          if (expect_false (glow_radius) && pl->is_on_map ())
-              update_all_los (pl->map, pl->x, pl->y);
+            update_all_los (pl->map, pl->x, pl->y);
-          }
+        }
     }
   else if (map)
     {
       map->dirty = true;
       mapspace &ms = this->ms ();
                 close_container ();
               --map->players;
               map->touch ();
             }
-          else if (pl->container == this)
+          else if (pl->container_ () == this)
             {
               // removing a container should close it
               close_container ();
             }
       int check_walk_off = !flag [FLAG_NO_APPLY];
       if (object *pl = ms.player ())
         {
-          if (pl->container == this)
+          if (pl->container_ () == this)
             /* If a container that the player is currently using somehow gets
              * removed (most likely destroyed), update the player view
              * appropriately.
              */
             pl->close_container ();
           //TODO: update floorbox to preserve ordering
           if (pl->contr->ns)
             pl->contr->ns->floorbox_update ();
         }
+      if (check_walk_off)
-      for (tmp = ms.bot; tmp; tmp = tmp->above)
+        for (object *above, *tmp = ms.bot; tmp; tmp = above)
-        {
+          {
+            above = tmp->above;
-          /* No point updating the players look faces if he is the object
+            /* No point updating the players look faces if he is the object
-           * being removed.
+             * being removed.
-           */
+             */
-          /* See if object moving off should effect something */
+            /* See if object moving off should effect something */
-          if (check_walk_off
-              && ((move_type & tmp->move_off)
+            if ((move_type & tmp->move_off)
-                  && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
+                && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
-            {
               move_apply (tmp, this, 0);
-              if (destroyed ())
-                LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
-            }
+          }
-          last = tmp;
-        }
       if (affects_los ())
         update_all_los (map, x, y);
     }
 }
   object *prev = this;
   for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
     {
-      object *op = arch_to_object (at);
+      object *op = at->instance ();
       op->name    = name;
       op->name_pl = name_pl;
       op->title   = title;
  * Passing 0 for flag gives proper default values, so flag really only needs
  * to be set if special handling is needed.
  *
  * Return value:
  *   new object if 'op' was merged with other object
- *   NULL if 'op' was destroyed
+ *   NULL if there was an error (destroyed, blocked etc.)
  *   just 'op' otherwise
  */
 object *
 insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
 {
           // from here :/
           op->nrof += tmp->nrof;
           tmp->destroy ();
         }
-  CLEAR_FLAG (op, FLAG_APPLIED);        /* hack for fixing F_APPLIED in items of dead people */
+  op->clr_flag (FLAG_APPLIED);        /* hack for fixing F_APPLIED in items of dead people */
-  CLEAR_FLAG (op, FLAG_INV_LOCKED);
+  op->clr_flag (FLAG_INV_LOCKED);
-  if (!QUERY_FLAG (op, FLAG_ALIVE))
+  if (!op->flag [FLAG_ALIVE])
-    CLEAR_FLAG (op, FLAG_NO_STEAL);
+    op->clr_flag (FLAG_NO_STEAL);
   if (flag & INS_BELOW_ORIGINATOR)
     {
       if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
         {
            * 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 (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
+              if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
                 floor = tmp;
-              if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
+              if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
                 {
                   /* We insert above top, so we want this object below this */
                   top = tmp->below;
                   break;
                 }
               && (op->face && !faces [op->face].visibility))
             {
               object *last;
               for (last = top; last != floor; last = last->below)
-                if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
+                if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
                   break;
               /* Check to see if we found the object that blocks view,
                * and make sure we have a below pointer for it so that
                * we can get inserted below this one, which requires we
   for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
     if (tmp->arch->archname == archname)       /* same archetype */
       tmp->destroy ();
-  object *tmp = arch_to_object (archetype::find (archname));
+  object *tmp = archetype::find (archname)->instance ();
   tmp->x = op->x;
   tmp->y = op->y;
   insert_ob_in_map (tmp, op->map, op, 0);
 {
   if (where->env)
     return where->env->insert (this);
   else
     return where->map->insert (this, where->x, where->y, originator, flags);
+}
+// check whether we can put this into the map, respect max_volume, max_items
+bool
+object::can_drop_at (maptile *m, int x, int y, object *originator)
+{
+  mapspace &ms = m->at (x, y);
+  int items = ms.items ();
+  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 ())
+    originator->contr->failmsgf (
+       "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;
 }
 /*
  * decrease(object, number) decreases a specified number from
  * the amount of an object. If the amount reaches 0, the object
   if (op->glow_radius && is_on_map ())
     {
       update_stats ();
       update_all_los (map, x, y);
     }
-  else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
+  else if (is_player ())
     // if this is a player's inventory, update stats
-    update_stats ();
+    contr->queue_stats_update ();
   INVOKE_OBJECT (INSERT, this);
   return op;
 }
  * on top.
  */
 int
 check_move_on (object *op, object *originator)
 {
-  if (QUERY_FLAG (op, FLAG_NO_APPLY))
+  if (op->flag [FLAG_NO_APPLY])
     return 0;
   object *tmp;
   maptile *m = op->map;
   int x = op->x, y = op->y;
        * Second check makes sure that the movement types not being slowed
        * (~slow_move) is not blocked on this space - just because the
        * space doesn't slow down swimming (for example), if you can't actually
        * swim on that space, can't use it to avoid the penalty.
        */
-      if (!QUERY_FLAG (op, FLAG_WIZPASS))
+      if (!op->flag [FLAG_WIZPASS])
         {
           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);
 void
 flag_inv (object *op, int flag)
 {
   for (object *tmp = op->inv; tmp; tmp = tmp->below)
     {
-      SET_FLAG (tmp, flag);
+      tmp->set_flag (flag);
       flag_inv (tmp, flag);
     }
 }
 /*
 void
 unflag_inv (object *op, int flag)
 {
   for (object *tmp = op->inv; tmp; tmp = tmp->below)
     {
-      CLEAR_FLAG (tmp, flag);
+      tmp->clr_flag (flag);
       unflag_inv (tmp, flag);
     }
 }
 /*
  * This basically means that if direction is 15, then it could either go
  * direction 4, 14, or 16 to get back to where we are.
  * Moved from spell_util.c to object.c with the other related direction
  * functions.
  */
-const int reduction_dir[SIZEOFFREE][3] = {
+static const int reduction_dir[SIZEOFFREE][3] = {
   {0, 0, 0},                    /* 0 */
   {0, 0, 0},                    /* 1 */
   {0, 0, 0},                    /* 2 */
   {0, 0, 0},                    /* 3 */
   {0, 0, 0},                    /* 4 */
  * Add a check so we can't pick up invisible objects (0.93.8)
  */
 int
 can_pick (const object *who, const object *item)
 {
-  return                        /*QUERY_FLAG(who,FLAG_WIZ)|| */
+  return                        /*who->flag [FLAG_WIZ]|| */
-    (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
+    (item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
-     !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
+     !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
 }
 /*
  * create clone from object to another
  */
 {
   return map ? map->region (x, y)
              : region::default_region ();
 }
-const materialtype_t *
-object::dominant_material () const
-{
-  if (materialtype_t *mt = name_to_material (materialname))
-    return mt;
-  return name_to_material (shstr_unknown);
-}
 void
 object::open_container (object *new_container)
 {
   if (container == new_container)
     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);
+          object *closer = new_container->other_arch->instance ();
           closer->flag [FLAG_NO_MAP_SAVE] = 1;
           new_container->insert (closer);
         }
 #endif
       return splay (tmp);
   return 0;
 }
+//-GPL
 void
 object::force_set_timer (int duration)
 {
   this->duration   = 1;
   this->speed_left = -1.f;
     force->destroy ();
   object *force = get_archetype (FORCE_NAME);
   force->slaying = name;
   force->force_set_timer (duration);
-  force->flag [FLAG_APPLIED]    = true;
+  force->flag [FLAG_APPLIED] = true;
   return insert (force);
 }
 void
       insert (force);
     }
 }
+void object::change_move_type (MoveType mt)
+{
+  if (move_type == mt)
+    return;
+  if (is_on_map ())
+    {
+      // we are on the map, so handle move_on/off effects
+      remove ();
+      move_type = mt;
+      map->insert (this, x, y, this);
+    }
+  else
+    move_type = mt;
+}

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.290 by sf-marcmagus, Sun Oct 11 05:43:35 2009 UTC vs. Revision 1.322 by root, Sun Apr 11 00:34:05 2010 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.290 by sf-marcmagus, Sun Oct 11 05:43:35 2009 UTC vs.
Revision 1.322 by root, Sun Apr 11 00:34:05 2010 UTC