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

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.94 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.101 by root, Fri Dec 26 13:33:22 2008 UTC

         }
       else
         {
           // drop everything to the ground, if possible
           op->insert_at (originator);
-          op->destroy_inv (true); // be explicit about dropping
-          op->destroy (true);
+          op->drop_and_destroy ();
         }
       if (type & (AT_FIRE | AT_ELECTRICITY))
         if (env)
           {
            * for help. */
           if (op->type != PLAYER && !can_see_enemy (op, hitter) && !op->owner && rndm (0, op->stats.Int))
             npc_call_help (op);
           /* if you were hidden and hit by a creature, you are discovered */
-          if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE))
+          if (op->flag [FLAG_HIDDEN] && hitter->flag [FLAG_ALIVE])
             {
               make_visible (op);
               if (op->type == PLAYER)
                 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!");
   /* Disassemble missile */
   if (op->inv)
     {
       container = op;
       hitter = op->inv;
-      container->insert_at (hitter, hitter,  INS_NO_MERGE | INS_NO_WALK_ON);
+      hitter->insert_at (container, hitter,  INS_NO_MERGE | INS_NO_WALK_ON);
       /* Note that we now have an empty THROWN_OBJ on the map.  Code that
        * might be called until this THROWN_OBJ is either reassembled or
        * removed at the end of this function must be able to deal with empty
        * THROWN_OBJs. */
     }
    * other places as well!)
    */
   if (hitter->destroyed () || hitter->env != NULL)
     {
       if (container)
-        container->destroy (true);
+        container->destroy ();
       return 0;
     }
   /* Missile hit victim */
           hitter = fix_stopped_arrow (hitter);
           if (!hitter)
             return 0;
         }
       else
-        container->destroy (true);
+        container->destroy ();
       /* Try to stick arrow into victim */
       if (!victim->destroyed () && stick_arrow (hitter, victim))
         return 0;
        * can fly over but not otherwise move over.  What is the correct
        * way to handle those otherwise?
        */
       if (victim->x != hitter->x || victim->y != hitter->y)
         {
+          if (victim->destroyed ())
+            hitter->destroy ();
+          else
+            {
-          hitter->remove ();
+              hitter->remove ();
-          hitter->x = victim->x;
+              hitter->x = victim->x;
-          hitter->y = victim->y;
+              hitter->y = victim->y;
-          insert_ob_in_map (hitter, victim->map, hitter, 0);
+              insert_ob_in_map (hitter, victim->map, hitter, 0);
+            }
         }
       else
         /* Else leave arrow where it is */
         merge_ob (hitter, NULL);
     }
   else if (!GET_ANIM_ID (op))
     {
       /* Object has been called - no animations, so remove it */
       if (op->stats.hp < 0)
-        op->destroy (true);
+        op->destroy ();
       return;                   /* no animations, so nothing more to do */
     }
   perc = NUM_ANIMATIONS (op) - ((int) NUM_ANIMATIONS (op) * op->stats.hp) / op->stats.maxhp;
   if (perc == NUM_ANIMATIONS (op) - 1)
     {                           /* Reached the last animation */
       if (op->face == blank_face)
         /* If the last face is blank, remove the ob */
-        op->destroy (true);
+        op->destroy ();
       else
         {                       /* The last face was not blank, leave an image */
           CLEAR_FLAG (op, FLAG_BLOCKSVIEW);
           update_all_los (op->map, op->x, op->y);
           op->move_block = 0;
       return maxdam;
     }
   if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)
     {
-      op->destroy_inv (true); // be explicit about dropping
-      op->destroy (true);
+      op->drop_and_destroy ();
       return maxdam;
     }
   /* Now lets start dealing with experience we get for killing something */
       else if (owner->chosen_skill)
         {
           skop  = owner->chosen_skill;
           skill = skop->skill;
         }
-      else if (QUERY_FLAG (owner, FLAG_READY_WEAPON))
+      else if (QUERY_FLAG (owner, FLAG_READY_WEAPON) && owner->current_weapon)
         skill = owner->current_weapon->skill;
       else
         {
-          LOG (llevError, "kill_object - unable to find skill that killed monster\n");
+          LOG (llevError, "BUG: kill_object - unable to find skill that killed monster\n"
+                          "op: %s\n"           "hitter: %s\n"          "owner: %s\n",
+                          owner->debug_desc (), hitter->debug_desc (), op->debug_desc ());
           skill = 0;
         }
       /* We have the skill we want to credit to - now find the object this goes
        * to. Make sure skop is an actual skill, and not a skill tool!
             }
           remove_friendly_object (op);
         }
-      op->destroy_inv (true); // be explicit about dropping
-      op->destroy (true);
+      op->drop_and_destroy ();
     }
   else
     /* Player has been killed! */
     op->contr->killer = owner->type == PLAYER ? owner : hitter;
   /* Used to be ghosthit removal - we now use the ONE_HIT flag.  Note
    * that before if the player was immune to ghosthit, the monster
    * remained - that is no longer the case.
    */
   if (QUERY_FLAG (hitter, FLAG_ONE_HIT))
-    {
-      hitter->destroy_inv (true); // be explicit about dropping
-      hitter->destroy (true);
+    hitter->drop_and_destroy ();
-    }
   /* Lets handle creatures that are splitting now */
   else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING))
     {
       int i;
       int friendly = QUERY_FLAG (op, FLAG_FRIENDLY);
             SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
           j = find_first_free_spot (tmp, op->map, op->x, op->y);
           if (j == -1)          /* No spot to put this monster */
-            tmp->destroy (true);
+            tmp->destroy ();
           else
             {
               tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j];
               insert_ob_in_map (tmp, op->map, NULL, 0);
             }
         }
-      op->destroy (true);
+      op->destroy ();
     }
   else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10)
-    {
-      hitter->destroy_inv (true); // be explicit about dropping
-      hitter->destroy (true);
+    hitter->drop_and_destroy ();
-    }
   return maxdam;
 }
 void
     {
       /* target is unseen */
       if (target->invisible || QUERY_FLAG (attacker, FLAG_BLIND))
         adjust -= 10;
       /* dark map penalty for the hitter (lacks infravision if we got here). */
-      else if (target->map && target->map->darkness > 0 && !stand_in_light (target))
+      else if (target->map && target->map->darklevel () > 0 && !stand_in_light (target))
-        adjust -= target->map->darkness;
+        adjust -= target->map->darklevel ();
     }
   if (QUERY_FLAG (attacker, FLAG_SCARED))
     adjust -= 3;

Diff Legend

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

Comparing deliantra/server/server/attack.C (file contents): Revision 1.94 by root, Mon Sep 29 10:20:49 2008 UTC vs. Revision 1.101 by root, Fri Dec 26 13:33:22 2008 UTC

Diff Legend

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.94 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.101 by root, Fri Dec 26 13:33:22 2008 UTC