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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.314 by root, Fri Mar 26 00:59:20 2010 UTC vs.
Revision 1.322 by root, Sun Apr 11 00:34:05 2010 UTC

    * 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
   /* 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:
     }
   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.
  */
 static void
 free_key_values (object *op)
  * 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);
 }
     /* 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.
     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;
   material = MATERIAL_NULL;
 }
             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])
       below = 0;
       env   = 0;
       if (pl && pl->is_player ())
         {
+          if (expect_false (pl->contr->combat_ob == this))
+            {
+              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);
         }
     }
   else if (map)
     {
           // 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
       || (items < m->max_items
           && ms.volume () < m->max_volume))
     return true;
   if (originator && originator->is_player ())
-    originator->contr->failmsg (format (
+    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;
 }
 /*
  * 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);
     }
 }
 /*
  * 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
  */

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.314 by root, Fri Mar 26 00:59:20 2010 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.314 by root, Fri Mar 26 00:59:20 2010 UTC vs.
Revision 1.322 by root, Sun Apr 11 00:34:05 2010 UTC