[comp.sources.bugs] nethack 2.2 fight.c fix

news@jpusa1.UUCP (usenet) (12/09/87)

Here's the fix for 'You stop to avoid hitting .'.  Feed to patch.
*** /tmp/,RCSt1a11194	Wed Dec  9 03:23:54 1987
--- fight.c	Wed Dec  9 03:23:10 1987
***************
*** 463,469
  	/*  changes by wwp 5/16/85 */
  	if (!Blind && !Confusion && !Hallucination
  	    && mdat->mlet == 'd' && mtmp->mtame) {
! 		char *dname;		/* added by Janet Walz (walz@mimsy) */
  		mtmp->mflee = 1;
  		mtmp->mfleetim = rnd(6);
  		if (dname = NAME(mtmp))

--- 463,469 -----
  	/*  changes by wwp 5/16/85 */
  	if (!Blind && !Confusion && !Hallucination
  	    && mdat->mlet == 'd' && mtmp->mtame) {
! 		/*char *dname;		/* added by Janet Walz (walz@mimsy) */
  		mtmp->mflee = 1;
  		mtmp->mfleetim = rnd(6);
  		if (mtmp->mnamelth)
***************
*** 466,473
  		char *dname;		/* added by Janet Walz (walz@mimsy) */
  		mtmp->mflee = 1;
  		mtmp->mfleetim = rnd(6);
! 		if (dname = NAME(mtmp))
! 		    pline("You stop to avoid hitting %s.",dname);
  		else
  		    pline("You stop to avoid hitting your dog.");
  		return(TRUE);

--- 466,473 -----
  		/*char *dname;		/* added by Janet Walz (walz@mimsy) */
  		mtmp->mflee = 1;
  		mtmp->mfleetim = rnd(6);
! 		if (mtmp->mnamelth)
! 		    pline("You stop to avoid hitting %s.",NAME(mtmp));
  		else
  		    pline("You stop to avoid hitting your dog.");
  		return(TRUE);
--
Stu Heiss {gargoyle,ihnp4}!jpusa1!stu