[Crossfire-cvs] CVS commit: crossfire/server

[<cro...@li...>]

Module Name:	crossfire
Committed By:	majorwoo
Date:		Tue Mar 22 03:15:07 UTC 2005

Modified Files:
	crossfire/server: player.c

Log Message:
Allow a player to hide if standing near a hidden dm. #1119594



Start of context diffs


Index: crossfire/server/player.c
diff -c crossfire/server/player.c:1.159 crossfire/server/player.c:1.160
*** crossfire/server/player.c:1.159	Sun Mar 20 14:26:27 2005
--- crossfire/server/player.c	Mon Mar 21 19:15:06 2005
***************
*** 1,6 ****
  /*
   * static char *rcsid_player_c =
!  *   "$Id: player.c,v 1.159 2005/03/20 22:26:27 majorwoo Exp $";
   */
  
  /*
--- 1,6 ----
  /*
   * static char *rcsid_player_c =
!  *   "$Id: player.c,v 1.160 2005/03/22 03:15:06 majorwoo Exp $";
   */
  
  /*
***************
*** 3043,3049 ****
  	    if((player||friendly)
  	       &&QUERY_FLAG(tmp,FLAG_MONSTER)&&!QUERY_FLAG(tmp,FLAG_UNAGGRESSIVE)) 
  		return 1;
! 	    else if(tmp->type==PLAYER) return 1;
  	}
      }
      return 0;
--- 3043,3055 ----
  	    if((player||friendly)
  	       &&QUERY_FLAG(tmp,FLAG_MONSTER)&&!QUERY_FLAG(tmp,FLAG_UNAGGRESSIVE)) 
  		return 1;
! 	    else if(tmp->type==PLAYER)
! 	    {
! 	      /*don't let a hidden DM prevent you from hiding*/
! 	      if ( (QUERY_FLAG(tmp, FLAG_WIZ)) && (tmp->contr->hidden==1) )
! 	        return 0;
! 	      return 1;
! 	    }  
  	}
      }
      return 0;