Difference for server/monster.c from version 1.52 to 1.53

version 1.52 version 1.53
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_monster_c =   * static char *rcsid_monster_c =
  *    "$Id: monster.c,v 1.52 2002/09/07 21:30:45 mwedel Exp $";   *    "$Id: monster.c,v 1.53 2002/09/10 05:43:34 mwedel Exp $";
  */   */
   
 /*  /*
Line 96
 
Line 96
  (QUERY_FLAG(npc->enemy, FLAG_FRIENDLY) ||    (QUERY_FLAG(npc->enemy, FLAG_FRIENDLY) ||
    npc->enemy->type == PLAYER || npc->enemy == npc->owner))     npc->enemy->type == PLAYER || npc->enemy == npc->owner))
      npc->enemy = NULL;       npc->enemy = NULL;
        
  else if (!QUERY_FLAG(npc, FLAG_FRIENDLY) &&    else if (!QUERY_FLAG(npc, FLAG_FRIENDLY) &&
              (!QUERY_FLAG(npc->enemy, FLAG_FRIENDLY) && npc->enemy->type!=PLAYER))               (!QUERY_FLAG(npc->enemy, FLAG_FRIENDLY) && npc->enemy->type!=PLAYER))
                 npc->enemy=NULL;                  npc->enemy=NULL;
Line 108
 
Line 107
  * as the enemy to attack.   * as the enemy to attack.
  */   */
  else if (!QUERY_FLAG(npc->enemy, FLAG_MONSTER) &&    else if (!QUERY_FLAG(npc->enemy, FLAG_MONSTER) &&
                   !QUERY_FLAG(npc->enemy,FLAG_GENERATOR ) && npc->type!=PLAYER)                    !QUERY_FLAG(npc->enemy,FLAG_GENERATOR) && npc->enemy->type!=PLAYER)
                 npc->enemy=NULL;                  npc->enemy=NULL;
   
     }      }

Legend:
line(s) removed in v.1.52 
line(s) changed
 line(s) added in v.1.53
File made using version 1.98 of cvs2html by leaf at 2011-07-21 17:37