Difference for common/living.c from version 1.41 to 1.42


version 1.41 version 1.42
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_living_c =   * static char *rcsid_living_c =
  *   "$Id: living.c,v 1.41 2002/11/12 23:20:11 garbled Exp $";   *   "$Id: living.c,v 1.42 2002/11/13 00:26:12 garbled Exp $";
  */   */
   
 /*  /*
Line 753
 
Line 753
  for(i=0;i<NUM_STATS;i++) {   for(i=0;i<NUM_STATS;i++) {
      set_attr_value(&(op->stats),i,get_attr_value(&(op->contr->orig_stats),i));       set_attr_value(&(op->stats),i,get_attr_value(&(op->contr->orig_stats),i));
  }   }
 #ifdef SPELL_ENCUMBRANCE   if (settings.spell_encumbrance == TRUE)
  op->contr->encumbrance=0;   op->contr->encumbrance=0;
 #endif  
  if(op->chosen_skill&&op->chosen_skill->exp_obj)   if(op->chosen_skill&&op->chosen_skill->exp_obj)
      op->chosen_skill->level=op->chosen_skill->exp_obj->level;       op->chosen_skill->level=op->chosen_skill->exp_obj->level;
   
Line 999
 
Line 998
   
  if(tmp->stats.ac)   if(tmp->stats.ac)
      ac-=(tmp->stats.ac+tmp->magic);       ac-=(tmp->stats.ac+tmp->magic);
 #ifdef SPELL_ENCUMBRANCE   if(settings.spell_encumbrance == TRUE &&
  if(op->type==PLAYER) op->contr->encumbrance+=(int)3*tmp->weight/1000;      op->type==PLAYER)
 #endif       op->contr->encumbrance+=(int)3*tmp->weight/1000;
      }       }
      break;       break;
  case SHIELD:   case SHIELD:
 #ifdef SPELL_ENCUMBRANCE       if(settings.spell_encumbrance == TRUE && op->type==PLAYER)
      if(op->type==PLAYER) op->contr->encumbrance+=(int)tmp->weight/2000;   op->contr->encumbrance+=(int)tmp->weight/2000;
 #endif  
  case RING:   case RING:
  case AMULET:   case AMULET:
  case GIRDLE:   case GIRDLE:
Line 1048
 
Line 1046
  }   }
 #endif  #endif
  op->current_weapon = tmp;   op->current_weapon = tmp;
    if(settings.spell_encumbrance == TRUE && op->type==PLAYER)
 #ifdef SPELL_ENCUMBRANCE       op->contr->encumbrance+=(int)3*tmp->weight/1000;
  if(op->type==PLAYER) op->contr->encumbrance+=(int)3*tmp->weight/1000;  
 #endif  
  break;   break;
   
  case ARMOUR: /* Only the best of these three are used: */   case ARMOUR: /* Only the best of these three are used: */
 #ifdef SPELL_ENCUMBRANCE       if(settings.spell_encumbrance == TRUE && op->type==PLAYER)
      if(op->type==PLAYER) op->contr->encumbrance+=(int)tmp->weight/1000;   op->contr->encumbrance+=(int)tmp->weight/1000;
 #endif  
  case BRACERS:   case BRACERS:
  case FORCE:   case FORCE:
      if(tmp->stats.wc) {        if(tmp->stats.wc) {


Legend:
line(s) removed in v.1.41 
line(s) changed
 line(s) added in v.1.42

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