Difference for server/rune.c from version 1.8 to 1.9


version 1.8 version 1.9
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_rune_c =   * static char *rcsid_rune_c =
  *   "$Id: rune.c,v 1.8 2000/06/09 00:17:22 cvs Exp $";   *   "$Id: rune.c,v 1.9 2000/11/06 23:06:47 jec Exp $";
  */   */
   
 /*  /*
Line 211
 
Line 211
    object *env;     object *env;
    tag_t trap_tag = trap->count;     tag_t trap_tag = trap->count;
   
   trap->stats.hp--;  /*decrement detcount */    /* Prevent recursion */
     if (trap->stats.hp <= 0)
       return;
   
   /*  get the spell number from the name in the slaying field, and set    /*  get the spell number from the name in the slaying field, and set
       that as the spell to be cast. */        that as the spell to be cast. */
   if((spell_in_rune=look_up_spell_by_name(NULL,trap->slaying))!=-1) trap->stats.sp=spell_in_rune;    if ((spell_in_rune = look_up_spell_by_name (NULL, trap->slaying)) != -1)
       trap->stats.sp=spell_in_rune;
   
     /* Only living objects can trigger runes that don't cast spells, as
      * doing direct damage to a non-living object doesn't work anyway.
      * Typical example is an arrow attacking a door.
      */
     if ( ! QUERY_FLAG (victim, FLAG_ALIVE) && ! trap->stats.sp)
       return;
   
     trap->stats.hp--;  /*decrement detcount */
   if(victim) if(victim->type==PLAYER) new_draw_info(NDI_UNIQUE, 0,victim,trap->msg);    if(victim) if(victim->type==PLAYER) new_draw_info(NDI_UNIQUE, 0,victim,trap->msg);
   /*  Flash an image of the trap on the map so the poor sod    /*  Flash an image of the trap on the map so the poor sod
    *   knows what hit him.  */     *   knows what hit him.  */
Line 239
 
Line 252
     cast_spell(trap,trap,trap->direction,trap->stats.sp,1,spellNormal,NULL);      cast_spell(trap,trap,trap->direction,trap->stats.sp,1,spellNormal,NULL);
   }    }
   
   if(!trap->stats.hp) {    if (trap->stats.hp <= 0) {
     trap->type=98;  /* make the trap impotent */      trap->type=98;  /* make the trap impotent */
     trap->stats.food=20;  /* make it stick around until its spells are gone */      trap->stats.food=20;  /* make it stick around until its spells are gone */
     SET_FLAG(trap,FLAG_IS_USED_UP);      SET_FLAG(trap,FLAG_IS_USED_UP);


Legend:
line(s) removed in v.1.8 
line(s) changed
 line(s) added in v.1.9

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