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

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.17 by root, Thu Sep 14 22:34:03 2006 UTC vs.
Revision 1.18 by root, Thu Sep 14 23:13:49 2006 UTC

   object *tmp, *next;
   mapstruct *map;
   sint16 x, y;
   int retflag = 0;              /* added this flag..  will return 1 if it hits a monster */
-  tag_t op_tag, next_tag = 0;
   if (QUERY_FLAG (op, FLAG_FREED))
     {
       LOG (llevError, "BUG: hit_map(): free object\n");
       return 0;
     }
       return 0;
     }
   if (op->head)
     op = op->head;
-  op_tag = op->count;
   map = op->map;
   x = op->x + freearr_x[dir];
   y = op->y + freearr_y[dir];
       update_object (op, UP_OBJ_FACE);
       type &= ~AT_CHAOS;
     }
   next = get_map_ob (map, x, y);
-  if (next)
-    next_tag = next->count;
   while (next)
     {
-      if (was_destroyed (next, next_tag))
+      if (next->destroyed ())
         {
           /* There may still be objects that were above 'next', but there is no
            * simple way to find out short of copying all object references and
            * tags into a temporary array before we start processing the first
            * object.  That's why we just abort.
         }
       tmp = next;
       next = tmp->above;
-      if (next)
+      if (tmp->destroyed ())
-        next_tag = next->count;
-      if (QUERY_FLAG (tmp, FLAG_FREED))
         {
           LOG (llevError, "BUG: hit_map(): found freed object\n");
           break;
         }
       if (QUERY_FLAG (tmp, FLAG_ALIVE))
         {
           hit_player (tmp, op->stats.dam, op, type, full_hit);
           retflag |= 1;
-          if (was_destroyed (op, op_tag))
+          if (op->destroyed ())
             break;
         }
       /* Here we are potentially destroying an object.  If the object has
        * NO_PASS set, it is also immune - you can't destroy walls.  Note
        * destroyed right now.
        */
       else if ((tmp->material || tmp->materialname) && op->stats.dam > 0 && !tmp->move_block)
         {
           save_throw_object (tmp, type, op);
-          if (was_destroyed (op, op_tag))
+          if (op->destroyed ())
             break;
         }
     }
   return 0;
 attack_ob_simple (object *op, object *hitter, int base_dam, int base_wc)
 {
   int simple_attack, roll, dam = 0;
   uint32 type;
   shstr op_name;
-  tag_t op_tag, hitter_tag;
   if (get_attack_mode (&op, &hitter, &simple_attack))
     goto error;
   if (hitter->current_weapon)
     if (INVOKE_OBJECT (WEAPON_ATTACK, hitter->current_weapon, ARG_OBJECT (hitter), ARG_OBJECT (op)))
       return RESULT_INT (0);
   if (INVOKE_OBJECT (ATTACK, op, ARG_OBJECT (hitter)))
     return RESULT_INT (0);
-  op_tag = op->count;
-  hitter_tag = hitter->count;
   /*
    * A little check to make it more difficult to dance forward and back
    * to avoid ever being hit by monsters.
    */
        * which then gets here again.  By decreasing the speed before
        * we call process_object, the 'if' statement above will fail.
        */
       op->speed_left--;
       process_object (op);
-      if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack))
+      if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
         goto error;
     }
   op_name = op->name;
            * when they hit the victim.  For things like thrown daggers,
            * this sets 'hitter' to the actual dagger, and not the
            * wrapper object.
            */
           thrown_item_effect (hitter, op);
-          if (was_destroyed (hitter, hitter_tag) || was_destroyed (op, op_tag) || abort_attack (op, hitter, simple_attack))
+          if (hitter->destroyed () || op->destroyed () || abort_attack (op, hitter, simple_attack))
             goto leave;
         }
       /* Need to do at least 1 damage, otherwise there is no point
        * to go further and it will cause FPE's below.
        */
       if (hitdam <= 0)
         hitdam = 1;
       type = hitter->attacktype;
       if (!type)
         type = AT_PHYSICAL;
       /* Handle monsters that hit back */
       if (!simple_attack && QUERY_FLAG (op, FLAG_HITBACK) && QUERY_FLAG (hitter, FLAG_ALIVE))
         {
           if (op->attacktype & AT_ACID && hitter->type == PLAYER)
             new_draw_info (NDI_UNIQUE, 0, hitter, "You are splashed by acid!\n");
           hit_player (hitter, random_roll (0, (op->stats.dam), hitter, PREFER_LOW), op, op->attacktype, 1);
-          if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack))
+          if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
             goto leave;
         }
       /* In the new attack code, it should handle multiple attack
        * types in its area, so remove it from here.
        */
       dam = hit_player (op, random_roll (1, hitdam, hitter, PREFER_HIGH), hitter, type, 1);
-      if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack))
+      if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
         goto leave;
     }                           /* end of if hitter hit op */
   /* if we missed, dam=0 */
   /*attack_message(dam, type, op, hitter); */
 object *
 hit_with_arrow (object *op, object *victim)
 {
   object *container, *hitter;
   int hit_something = 0;
-  tag_t victim_tag, hitter_tag;
   sint16 victim_x, victim_y;
   /* Disassemble missile */
   if (op->inv)
     {
     }
   /* Try to hit victim */
   victim_x = victim->x;
   victim_y = victim->y;
-  victim_tag = victim->count;
-  hitter_tag = hitter->count;
   hit_something = attack_ob_simple (victim, hitter, op->stats.dam, op->stats.wc);
   /* Arrow attacks door, rune of summoning is triggered, demon is put on
    * arrow, move_apply() calls this function, arrow sticks in demon,
    * attack_ob_simple() returns, and we've got an arrow that still exists
    * but is no longer on the map. Ugh. (Beware: Such things can happen at
    * other places as well!)
    */
-  if (was_destroyed (hitter, hitter_tag) || hitter->env != NULL)
+  if (hitter->destroyed () || hitter->env != NULL)
     {
       if (container)
         {
           remove_ob (container);
           free_object (container);
           remove_ob (container);
           free_object (container);
         }
       /* Try to stick arrow into victim */
-      if (!was_destroyed (victim, victim_tag) && stick_arrow (hitter, victim))
+      if (!victim->destroyed () && stick_arrow (hitter, victim))
         return NULL;
       /* Else try to put arrow on victim's map square
        * remove check for P_WALL here.  If the arrow got to this
        * space, that is good enough - with the new movement code,
 {
   int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC);
   int maxattacktype, attacknum;
   int body_attack = op && op->head;     /* Did we hit op's head? */
   int simple_attack;
-  tag_t op_tag, hitter_tag;
   int rtn_kill = 0;
   int friendlyfire;
   if (get_attack_mode (&op, &hitter, &simple_attack))
     return 0;
     {
       object *owner = get_owner (hitter);
       if (!owner)
         owner = hitter;
       if (owner->type == PLAYER && (!op_on_battleground (op, 0, 0) && (op->contr->peaceful || owner->contr->peaceful)) && op != owner)
-        {
-          return 0;
+        return 0;
-        }
     }
 #endif
-  op_tag = op->count;
-  hitter_tag = hitter->count;
   if (body_attack)
     {
       /* slow and paralyze must hit the head.  But we don't want to just
        * return - we still need to process other attacks the spell still
        * attack so we don't cancel out things like magic bullet.
        */
       if (type & (AT_PARALYZE | AT_SLOW))
         {
           type &= ~(AT_PARALYZE | AT_SLOW);
           if (!type || type == AT_MAGIC)
             return 0;
         }
     }
       for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
         if (tmp->type == RUNE || tmp->type == TRAP)
           {
             spring_trap (tmp, hitter);
-            if (was_destroyed (hitter, hitter_tag) || was_destroyed (op, op_tag) || abort_attack (op, hitter, simple_attack))
+            if (hitter->destroyed () || op->destroyed () || abort_attack (op, hitter, simple_attack))
               return 0;
             break;
           }
     }
   if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0)
     {
       /* FIXME: If a player is killed by a rune in a door, the
-       * was_destroyed() check above doesn't return, and might get here.
+       * destroyed() check above doesn't return, and might get here.
        */
       LOG (llevDebug, "victim (arch %s, name %s) already dead in " "hit_player()\n", &op->arch->name, &op->name);
       return 0;
     }

Diff Legend

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

Comparing deliantra/server/server/attack.C (file contents): Revision 1.17 by root, Thu Sep 14 22:34:03 2006 UTC vs. Revision 1.18 by root, Thu Sep 14 23:13:49 2006 UTC

Diff Legend

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.17 by root, Thu Sep 14 22:34:03 2006 UTC vs.
Revision 1.18 by root, Thu Sep 14 23:13:49 2006 UTC