Difference for server/pets.c from version 1.25 to 1.26

version 1.25 version 1.26
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_pets_c =   * static char *rcsid_pets_c =
  *    "$Id: pets.c,v 1.25 2005/03/06 20:38:54 akirschbaum Exp $";   *    "$Id: pets.c,v 1.26 2005/07/16 19:03:01 qal21 Exp $";
  */   */
   
 /*  /*
Line 115
 
Line 115
      for (tmp = get_map_ob(nm, x, y); tmp != NULL; tmp = tmp->above) {       for (tmp = get_map_ob(nm, x, y); tmp != NULL; tmp = tmp->above) {
  object *tmp2 = tmp->head == NULL?tmp:tmp->head;   object *tmp2 = tmp->head == NULL?tmp:tmp->head;
   
  if (QUERY_FLAG(tmp2,FLAG_ALIVE) && !QUERY_FLAG(tmp2,FLAG_FRIENDLY)   if (QUERY_FLAG(tmp2,FLAG_ALIVE) && (
      && !QUERY_FLAG(tmp2,FLAG_UNAGGRESSIVE) && tmp2 != pet &&    !QUERY_FLAG(tmp2, FLAG_FRIENDLY) || (
      tmp2 != owner && tmp2->type != PLAYER &&   op_on_battleground(pet, NULL, NULL) &&
    op_on_battleground(owner, NULL, NULL) &&
    op_on_battleground(tmp2, NULL, NULL) &&
    (owner->contr->petmode == pet_arena) && !(
    (tmp2->owner->contr->party_number ==
    owner->contr->party_number) &&
    (owner->contr->party_number > 0))))
        && !QUERY_FLAG(tmp2,FLAG_UNAGGRESSIVE) &&
        tmp2 != pet && tmp2 != owner && (
        (tmp2->type != PLAYER) || (
    op_on_battleground(pet, NULL, NULL) &&
    op_on_battleground(owner, NULL, NULL) &&
    op_on_battleground(tmp2, NULL, NULL) &&
    (owner->contr->petmode == pet_arena) && !(
    (tmp2->contr->party_number ==
    owner->contr->party_number) &&
    (owner->contr->party_number > 0)))) &&
      can_detect_enemy(pet, tmp2, rv)) {       can_detect_enemy(pet, tmp2, rv)) {
   
  if (!can_see_enemy(pet, tmp2)) {   if (!can_see_enemy(pet, tmp2)) {
Line 179
 
Line 195
      if (get_map_flags(nm, &nm, x,y, &x, &y) & P_IS_ALIVE) {       if (get_map_flags(nm, &nm, x,y, &x, &y) & P_IS_ALIVE) {
  for (tmp = get_map_ob(nm, x, y); tmp != NULL; tmp = tmp->above) {   for (tmp = get_map_ob(nm, x, y); tmp != NULL; tmp = tmp->above) {
      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)   op_on_battleground(pet, NULL, NULL) &&
    op_on_battleground(owner, NULL, NULL) &&
    op_on_battleground(tmp2, NULL, NULL) &&
    (owner->contr->petmode == pet_arena) && !(
    (tmp2->owner->contr->party_number ==
    owner->contr->party_number) &&
    (owner->contr->party_number > 0))))
  && !QUERY_FLAG(tmp2,FLAG_UNAGGRESSIVE) &&   && !QUERY_FLAG(tmp2,FLAG_UNAGGRESSIVE) &&
  tmp2 != pet && tmp2 != owner && tmp2->type != PLAYER &&   tmp2 != pet && tmp2 != owner && (
    (tmp2->type != PLAYER) || (
    op_on_battleground(pet, NULL, NULL) &&
    op_on_battleground(owner, NULL, NULL) &&
    op_on_battleground(tmp2, NULL, NULL) &&
    (owner->contr->petmode == pet_arena) && !(
    (tmp2->contr->party_number ==
    owner->contr->party_number) &&
    (owner->contr->party_number > 0)))) &&
  can_detect_enemy(pet, tmp2, rv)) {   can_detect_enemy(pet, tmp2, rv)) {
   
      if (!can_see_enemy(pet, tmp2)) {       if (!can_see_enemy(pet, tmp2)) {

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