Difference for common/living.c from version 1.6 to 1.7


version 1.6 version 1.7
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_living_c =   * static char *rcsid_living_c =
  *   "$Id: living.c,v 1.6 2000/05/27 05:23:22 cvs Exp $";   *   "$Id: living.c,v 1.7 2000/06/08 16:08:41 jec Exp $";
  */   */
   
 /*  /*
Line 1052
 
Line 1052
           if(tmp->armour)            if(tmp->armour)
             op->armour+=((100-op->armour)*tmp->armour)/100;              op->armour+=((100-op->armour)*tmp->armour)/100;
   
           if(tmp->slaying!=NULL)            if(tmp->slaying!=NULL) {
               if (op->slaying != NULL)
                 free_string (op->slaying);
             add_refcount(op->slaying = tmp->slaying);              add_refcount(op->slaying = tmp->slaying);
             }
   
    if(tmp->stats.ac)     if(tmp->stats.ac)
             op->stats.ac-=(tmp->stats.ac+tmp->magic);              op->stats.ac-=(tmp->stats.ac+tmp->magic);
Line 1094
 
Line 1097
         weapon_weight=tmp->weight;          weapon_weight=tmp->weight;
         weapon_speed=((int)WEAPON_SPEED(tmp)*2-tmp->magic)/2;          weapon_speed=((int)WEAPON_SPEED(tmp)*2-tmp->magic)/2;
         if(weapon_speed<0) weapon_speed=0;          if(weapon_speed<0) weapon_speed=0;
         if(tmp->slaying!=NULL)          if(tmp->slaying!=NULL) {
             if (op->slaying != NULL)
               free_string (op->slaying);
           add_refcount(op->slaying = tmp->slaying);            add_refcount(op->slaying = tmp->slaying);
           }
 #ifdef SPELL_ENCUMBRANCE  #ifdef SPELL_ENCUMBRANCE
  if(op->type==PLAYER) op->contr->encumbrance+=(int)3*tmp->weight/1000;   if(op->type==PLAYER) op->contr->encumbrance+=(int)3*tmp->weight/1000;
 #endif  #endif


Legend:
line(s) removed in v.1.6 
line(s) changed
 line(s) added in v.1.7

File made using version 1.98 of cvs2html by leaf at 2011-07-21 17:09