[Slashem-checkins] CVS: slashem/src eat.c,1.42,1.43

[J. A. H. <j_...@us...>]

Update of /cvsroot/slashem/slashem/src
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21927/src

Modified Files:
	eat.c 
Log Message:
Fixed bug 1708141: "the" in "the Rat King" uncapitalized when eating corpse
Based on a patch sent to slashem-devel by kernigh on 2007-11-20.


Index: eat.c
===================================================================
RCS file: /cvsroot/slashem/slashem/src/eat.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** eat.c	29 Dec 2006 14:05:32 -0000	1.42
--- eat.c	30 Dec 2007 17:22:58 -0000	1.43
***************
*** 22,25 ****
--- 22,26 ----
  #ifdef OVLB
  STATIC_DCL const char *FDECL(food_xname, (struct obj *,BOOLEAN_P));
+ STATIC_DCL const char *FDECL(Food_xname, (struct obj *,BOOLEAN_P));
  STATIC_DCL void FDECL(choke, (struct obj *));
  STATIC_DCL void NDECL(recalc_wt);
***************
*** 251,254 ****
--- 252,266 ----
  }
  
+ STATIC_OVL const char *
+ Food_xname(food, the_pfx)
+ struct obj *food;
+ boolean the_pfx;
+ {
+ 	/* food_xname() uses a modifiable buffer, so we can use it too */ 
+ 	char *buf = (char *)food_xname(food, the_pfx);
+ 
+ 	*buf = highc(*buf);
+ 	return buf;
+ }
  
  /* Created by GAN 01/28/87
***************
*** 1616,1622 ****
  	        otmp->oeaten = drainlevel(otmp);
  	} else if (!is_vampire(youmonst.data)) {
  	    pline("%s%s %s!",
! 		  !uniq ? "This " : !type_is_pname(&mons[mnum]) ? "The " : "",
! 		  food_xname(otmp, FALSE),
  		  (vegan(&mons[mnum]) ?
  		   (!carnivorous(youmonst.data) && herbivorous(youmonst.data)) :
--- 1628,1636 ----
  	        otmp->oeaten = drainlevel(otmp);
  	} else if (!is_vampire(youmonst.data)) {
+ 	    boolean pname = type_is_pname(&mons[mnum]);
  	    pline("%s%s %s!",
! 		  !uniq ? "This " : !pname ? "The " : "",
! 		  uniq && pname ?
! 		   Food_xname(otmp, FALSE) : food_xname(otmp, FALSE),
  		  (vegan(&mons[mnum]) ?
  		   (!carnivorous(youmonst.data) && herbivorous(youmonst.data)) :