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

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.48 by root, Thu Jan 18 22:20:00 2007 UTC vs.
Revision 1.53 by root, Fri Mar 30 21:53:09 2007 UTC

 #include <assert.h>
 #include <global.h>
 #include <living.h>
 #include <material.h>
 #include <skills.h>
-#ifndef __CEXTRACT__
-# include <sproto.h>
-#endif
 #include <sounds.h>
+#include <sproto.h>
 typedef struct att_msg_str
 {
   char *msg1;
   char *msg2;
   materialtype_t *mt;
   if (op->materialname == NULL)
     {
       for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next)
-        if (op->material & mt->material)
+        if (op->materials & mt->material)
           break;
     }
   else
     mt = name_to_material (op->materialname);
        * that weak walls have is_alive set, which prevent objects from
        * passing over/through them.  We don't care what type of movement
        * the wall blocks - if it blocks any type of movement, can't be
        * destroyed right now.
        */
-      else if ((tmp->material || tmp->materialname) && op->stats.dam > 0 && !tmp->move_block)
+      else if (tmp->materialname && op->stats.dam > 0 && !tmp->move_block)
         {
           save_throw_object (tmp, type, op);
           if (op->destroyed ())
             break;
         {
           i = 4;
           map = hitter->map;
           if (out_of_map (map, hitter->x, hitter->y))
             return;
           next = GET_MAP_OB (map, hitter->x, hitter->y);
           if (next)
             while (next)
               {
                 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE))
                   i *= 3;
                 tmp = next;
                 next = tmp->above;
               }
           if (i < 0)
             return;
           if (rndm (0, i) != 0)
             return;
         }
       else if (rndm (0, 5) != 0)
         return;
       sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);
       play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4);
       new_draw_info (NDI_BLACK, 0, hitter->owner, buf);
     }
 }
                   if (tmp->invisible)
                     continue;
                   if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10))
                     /* >= 10% acid res. on items will protect these */
                     continue;
-                  if (!(tmp->material & M_IRON))
+                  if (!(tmp->materials & M_IRON))
                     continue;
                   if (tmp->magic < -4)        /* Let's stop at -5 */
                     continue;
                   if (tmp->type == RING
                       /* removed boots and gloves from exclusion list in PR */
         skill = owner->current_weapon->skill;
       else
         LOG (llevError, "kill_object - unable to find skill that killed monster\n");
       /* 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!
+       * to. Make sure skop is an actual skill, and not a skill tool!
        */
       if ((!skop || skop->type != SKILL) && skill)
         {
           int i;
       if (owner->type != PLAYER || owner->contr->party == NULL)
         change_exp (owner, exp, skill, 0);
       else
         {
           int shares = 0, count = 0;
-          player *pl;
           partylist *party = owner->contr->party;
           add_kill_to_party (party, query_name (owner), query_name (op), exp);
           for_all_players (pl)
     op->speed_left = (float) -(FABS (op->speed) * max);
 /*      tmp->stats.food = (signed short) (max/FABS(op->speed)); */
 }
 /* Attempts to kill 'op'.  hitter is the attack object, dam is
  * the computed damaged.
  */
 void
 deathstrike_player (object *op, object *hitter, int *dam)
   if (def_lev < 1)
     {
       LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->name, &op->name);
       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",
      atk_lev, def_lev); */
   if (atk_lev >= def_lev)
            */
           *dam *= kill_lev / def_lev;
         }
     }
   else
-    {
-      *dam = 0;                 /* no harm done */
+    *dam = 0;                 /* no harm done */
-    }
 }
 /* thrown_item_effect() - handles any special effects of thrown
  * items (like attacking living creatures--a potion thrown at a
  * monster).
 #endif
   return adjust;
 }
 /* determine if the object is an 'aimed' missile */
 int
 is_aimed_missile (object *op)
 {
       if (op->type == ARROW || op->type == THROWN_OBJ)
         return 1;
       else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION))
         return 1;
     }
   return 0;
 }

Diff Legend

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

Comparing deliantra/server/server/attack.C (file contents): Revision 1.48 by root, Thu Jan 18 22:20:00 2007 UTC vs. Revision 1.53 by root, Fri Mar 30 21:53:09 2007 UTC

Diff Legend

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.48 by root, Thu Jan 18 22:20:00 2007 UTC vs.
Revision 1.53 by root, Fri Mar 30 21:53:09 2007 UTC