Difference for common/loader.l from version 1.48 to 1.49


version 1.48 version 1.49
Line 1
 
Line 1
 %{  %{
 /*  /*
  * static char *rcsid_object_c =   * static char *rcsid_object_c =
  *   "$Id: loader.l,v 1.48 2003/08/08 17:49:31 tchize Exp $";   *   "$Id: loader.l,v 1.49 2003/09/03 12:25:06 tchize Exp $";
  */   */
   
 /*  /*
Line 197
 
Line 197
  op->name,   op->name,
  op->stats.hp, op->stats.maxhp);   op->stats.hp, op->stats.maxhp);
     }      }
       if ((QUERY_FLAG(op,FLAG_GENERATOR)) && QUERY_FLAG(op,FLAG_CONTENT_ON_GEN)){
           /* Generator will duplicate it's content as part of the
            * generation process. To do this, we must flag inventory
            * so it remains unevaluated concerning the randomitems and
            * the living (a demonlord shouldn't cast from inside generator!)
            */
           flag_inv(op,FLAG_IS_A_TEMPLATE);
       }
   
 }  }
   
Line 416
 
Line 424
  else CLEAR_FLAG(op, FLAG_FRIENDLY);   else CLEAR_FLAG(op, FLAG_FRIENDLY);
      }       }
 ^generator{S}     SET_OR_CLEAR_FLAG(op, FLAG_GENERATOR, IVAL);  ^generator{S}     SET_OR_CLEAR_FLAG(op, FLAG_GENERATOR, IVAL);
   ^use_content_on_gen{S} SET_OR_CLEAR_FLAG (op,FLAG_CONTENT_ON_GEN, IVAL);
 ^is_thrown{S}     SET_OR_CLEAR_FLAG(op, FLAG_IS_THROWN, IVAL);  ^is_thrown{S}     SET_OR_CLEAR_FLAG(op, FLAG_IS_THROWN, IVAL);
 ^auto_apply{S}     SET_OR_CLEAR_FLAG(op, FLAG_AUTO_APPLY, IVAL);  ^auto_apply{S}     SET_OR_CLEAR_FLAG(op, FLAG_AUTO_APPLY, IVAL);
 ^treasure{S}     SET_OR_CLEAR_FLAG(op, FLAG_TREASURE, IVAL);  ^treasure{S}     SET_OR_CLEAR_FLAG(op, FLAG_TREASURE, IVAL);
Line 997
 
Line 1006
  * put gaps in the array that should not be processed.   * put gaps in the array that should not be processed.
  * The order matches the order of the define values in 'define.h'.   * The order matches the order of the define values in 'define.h'.
  */   */
 /* This is a list of pointers taht correspond to the FLAG_.. values.  /* This is a list of pointers that correspond to the FLAG_.. values.
  * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then   * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then
  * the 15'th element of this array should match that name.   * the 15'th element of this array should match that name.
  * If an entry is NULL, that is a flag not to loaded/saved.   * If an entry is NULL, that is a flag not to loaded/saved.
Line 1006
 
Line 1015
 "alive", "wiz", NULL, NULL, "was_wiz", "applied", "unpaid",  "alive", "wiz", NULL, NULL, "was_wiz", "applied", "unpaid",
 "can_use_shield", "no_pick", "walk_on", "no_pass", /* 10 */  "can_use_shield", "no_pick", "walk_on", "no_pass", /* 10 */
 "is_animated", NULL, "flying", "monster", "friendly", "generator",  "is_animated", NULL, "flying", "monster", "friendly", "generator",
 "is_thrown", "auto_apply", "treasure", NULL /* flag_invis_undead */, /* 20 */  "is_thrown", "auto_apply", "treasure", NULL /*invis_undead*/,   /* 20 */
 "see_invisible", "can_roll", "overlay_floor", "is_turnable", "walk_off",  "see_invisible", "can_roll", "overlay_floor",
 "fly_on", "fly_off", "is_used_up", "identified", "reflecting", /* 30 */  "is_turnable", "walk_off", "fly_on",
   "fly_off", "is_used_up", "identified", "reflecting",            /* 30 */
 "changing", "splitting", "hitback", "startequip",  "changing", "splitting", "hitback", "startequip",
 "blocksview", "undead", "scared", "unaggressive",  "blocksview", "undead", "scared", "unaggressive",
 "reflect_missile", "reflect_spell", /* 40 */  "reflect_missile", "reflect_spell", /* 40 */
Line 1028
 
Line 1038
 "no_skill_ident", "is_blind", "can_see_in_dark", "is_cauldron",   "no_skill_ident", "is_blind", "can_see_in_dark", "is_cauldron",
 "is_dust", "no_steal", "one_hit", NULL, "berserk", "neutral", /* 100 */  "is_dust", "no_steal", "one_hit", NULL, "berserk", "neutral", /* 100 */
 "no_attack", "no_damage", NULL, NULL, "activate_on_push",  "no_attack", "no_damage", NULL, NULL, "activate_on_push",
 "activate_on_release", "is_water" /* 104 */  "activate_on_release", "is_water", "use_content_on_gen", NULL   /* 109 */
 };  };
   
   


Legend:
line(s) removed in v.1.48 
line(s) changed
 line(s) added in v.1.49

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