Difference for server/pets.c from version 1.27 to 1.28

version 1.27 version 1.28
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_pets_c =   * static char *rcsid_pets_c =
  *    "$Id: pets.c,v 1.27 2005/07/16 21:10:39 akirschbaum Exp $";   *    "$Id: pets.c,v 1.28 2005/07/17 04:19:49 qal21 Exp $";
  */   */
   
 /*  /*
Line 117
 
Line 117
   
  if (QUERY_FLAG(tmp2,FLAG_ALIVE) && (   if (QUERY_FLAG(tmp2,FLAG_ALIVE) && (
  !QUERY_FLAG(tmp2, FLAG_FRIENDLY) || (   !QUERY_FLAG(tmp2, FLAG_FRIENDLY) || (
    (owner != tmp2->owner) &&
  op_on_battleground(pet, NULL, NULL) &&    op_on_battleground(pet, NULL, NULL) &&
  op_on_battleground(owner, NULL, NULL) &&    op_on_battleground(owner, NULL, NULL) &&
  op_on_battleground(tmp2, NULL, NULL) &&    op_on_battleground(tmp2, NULL, NULL) &&
Line 197
 
Line 198
      object *tmp2 = tmp->head == NULL?tmp:tmp->head;       object *tmp2 = tmp->head == NULL?tmp:tmp->head;
      if (QUERY_FLAG(tmp2,FLAG_ALIVE) && (       if (QUERY_FLAG(tmp2,FLAG_ALIVE) && (
  !QUERY_FLAG(tmp2, FLAG_FRIENDLY) || (   !QUERY_FLAG(tmp2, FLAG_FRIENDLY) || (
    (owner != tmp2->owner) &&
  op_on_battleground(pet, NULL, NULL) &&    op_on_battleground(pet, NULL, NULL) &&
  op_on_battleground(owner, NULL, NULL) &&    op_on_battleground(owner, NULL, NULL) &&
  op_on_battleground(tmp2, NULL, NULL) &&    op_on_battleground(tmp2, NULL, NULL) &&

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