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

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.87 by root, Mon Jul 14 18:36:43 2008 UTC vs.
Revision 1.105 by root, Thu Jan 1 11:41:17 2009 UTC

   int i, roll, saves = 0, attacks = 0, number;
   materialtype_t *mt;
   if (!op->materialname)
     {
-      for (mt = materialt; mt && mt->next; mt = mt->next)
+      for (mt = materialt; mt; mt = mt->next)
         if (op->materials & mt->material)
           break;
     }
   else
     mt = name_to_material (op->materialname);
       object *env = op->env;
       int x = op->x, y = op->y;
       maptile *m = op->map;
       op = stop_item (op);
-      if (op == NULL)
+      if (!op)
         return;
       /* Hacked the following so that type LIGHTER will work.
        * Also, objects which are potential "lights" that are hit by
        * flame/elect attacks will be set to glow. "lights" are any
             fix_stopped_item (op, m, originator);
         }
       else
         {
           // drop everything to the ground, if possible
-          while (op->inv)
-            op->inv->insert_at (originator);
+          op->insert_at (originator);
-          op->destroy ();
+          op->drop_and_destroy ();
         }
       if (type & (AT_FIRE | AT_ELECTRICITY))
         if (env)
           {
       return;
     }
   /* The value of 50 is arbitrary. */
-  if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && (RANDOM () & 2))
+  if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && rndm (2))
     {
       archetype *at = archetype::find (shstr_icecube);
       if (at == NULL)
         return;
            * 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;
-      hitter->remove ();
-      insert_ob_in_map (hitter, container->map, 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->remove ();
-          container->destroy ();
+        container->destroy ();
-        }
       return 0;
     }
   /* Missile hit victim */
        * 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);
   if (attacknum == ATNR_INTERNAL)
     return dam;
   if (hitter->slaying)
     {
-      if ((op->race && strstr (hitter->slaying, op->race))
+      if ((op->race && hitter->slaying.contains (op->race))
-          || (op->arch && op->arch->archname && strstr (op->arch->archname, hitter->slaying)))
+          || (op->arch && op->arch->archname && op->arch->archname.contains (hitter->slaying)))
         {
           doesnt_slay = 0;
           dam *= 3;
         }
     }
               object *god = find_god (determine_god (owner));
               int div = 1;
               /* if undead are not an enemy of your god, you turn them
                * at half strength */
-              if (!god || !god->slaying || strstr (god->slaying, shstr_undead) == NULL)
+              if (!god || !god->slaying || !god->slaying.contains (shstr_undead))
                 div = 2;
               /* Give a bonus if you resist turn undead */
               if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
                 scare_creature (op, owner);
  */
 int
 kill_object (object *op, int dam, object *hitter, int type)
 {
   char buf[MAX_BUF];
-  const char *skill;
+  shstr skill;
   int maxdam = 0;
   int battleg = 0;              /* true if op standing on battleground */
   int pk = 0;                   /* true if op and what controls hitter are both players */
   object *owner = 0;
   object *skop  = 0;
       return maxdam;
     }
   if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)
     {
-      op->destroy ();
+      op->drop_and_destroy ();
       return maxdam;
     }
   /* Now lets start dealing with experience we get for killing something */
-  owner = hitter->owner;
+  owner = hitter->outer_owner ();
   if (!owner)
     owner = hitter;
   /* is the victim (op) standing on battleground? */
   if (op_on_battleground (op, NULL, NULL))
       /* This code below deals with finding the appropriate skill
        * to credit exp to. This is a bit problematic - we should
        * probably never really have to look at current_weapon->skill
        */
-      skill = 0;
       if (hitter->skill && hitter->type != PLAYER)
         skill = hitter->skill;
       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!
        */
-      if ((!skop || skop->type != SKILL) && skill)
+      skop = owner->contr->find_skill (skill);
-        {
-          int i;
-          for (i = 0; i < NUM_SKILLS; i++)
-            if (owner->contr->last_skill_ob[i] && !strcmp (owner->contr->last_skill_ob[i]->skill, skill))
-              {
-                skop = owner->contr->last_skill_ob[i];
-                break;
-              }
-        }
     }                           /* Was it a player that hit somethign */
   else
     skill = 0;
-  /* Pet (or spell) killed something. */
-  if (owner != hitter)
-    sprintf (buf, "%s killed %s with %s%s%s.", &owner->name,
-             query_name (op), query_name (hitter), battleg ? " (duel)" : "", pk ? " (pk)" : "");
-  else
-    sprintf (buf, "%s killed %s%s%s%s.", &hitter->name, &op->name,
-             (QUERY_FLAG (hitter, FLAG_MONSTER)) || hitter->type == PLAYER ?
-             " in hand to hand combat" : "", battleg ? " (duel)" : "", pk ? " (pk)" : "");
   /* These may have been set in the player code section above */
   if (!skop)
     skop = hitter->chosen_skill;
   if (!skill && skop)
     skill = skop->skill;
-  new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf);
   /* If you didn't kill yourself, and your not the wizard */
   if (owner != op && !QUERY_FLAG (op, FLAG_WIZ))
     {
       int exp;
           if (owner1 && owner1->type == PLAYER)
             {
               owner1->contr->play_sound (sound_find ("pet_is_killed"));
               /* Maybe we should include the owner that killed this, maybe not */
-              new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name);
+              new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, was killed by %s.", &op->name, &hitter->name);
             }
           remove_friendly_object (op);
         }
-      op->destroy ();
+      op->drop_and_destroy ();
     }
   else
     /* Player has been killed! */
     op->contr->killer = owner->type == PLAYER ? owner : hitter;
    */
   if (type & AT_HOLYWORD)
     {
       object *god;
-      if ((!hitter->slaying ||
+      if ((!hitter->slaying
-           (!(op->race && strstr (hitter->slaying, op->race)) &&
+           || (!(op->race && hitter->slaying.contains (op->race))
-            !(op->name && strstr (hitter->slaying, op->name)))) &&
+               && !(op->name && hitter->slaying.contains (op->name))))
-          (!QUERY_FLAG (op, FLAG_UNDEAD) ||
+          && (!QUERY_FLAG (op, FLAG_UNDEAD)
-           (hitter->title != NULL
+              || (hitter->title
-            && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, shstr_undead) != NULL)))
+                  && (god = find_god (determine_god (hitter))) != NULL
+                  && god->race
+                  && god->race.contains (shstr_undead))))
         return 0;
     }
   maxattacktype = type;         /* initialise this to something */
   for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)
   /* See if the creature has been killed */
   rtn_kill = kill_object (op, maxdam, hitter, type);
   if (rtn_kill != -1)
     return rtn_kill;
   /* 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 ();
+    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);
         }
       op->destroy ();
     }
   else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10)
-    hitter->destroy ();
+    hitter->drop_and_destroy ();
   return maxdam;
 }
 void
    **  field of the deathstriking object  */
   int atk_lev, def_lev, kill_lev;
   if (hitter->slaying)
-    if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, shstr_undead)) || (op->race && strstr (hitter->slaying, op->race))))
+    if (!((QUERY_FLAG (op, FLAG_UNDEAD) && hitter->slaying.contains (shstr_undead))
+        || (op->race && hitter->slaying.contains (op->race))))
       return;
   def_lev = op->level;
   if (def_lev < 1)
     {
-      LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->archname, &op->name);
+      LOG (llevError, "BUG: arch %s with level < 1 (%s)\n", &op->arch->archname, op->debug_desc ());
       def_lev = 1;
     }
   atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;
   /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",
     {
       /* 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 (!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.87 by root, Mon Jul 14 18:36:43 2008 UTC vs. Revision 1.105 by root, Thu Jan 1 11:41:17 2009 UTC

Diff Legend

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.87 by root, Mon Jul 14 18:36:43 2008 UTC vs.
Revision 1.105 by root, Thu Jan 1 11:41:17 2009 UTC