Subject: Re: Bugfixes for homemade 3.3.1?
From: [email-masked] (Philipp Lucas)
Date: Fri, 30 Jun 2000 06:03:30 GMT
Newsgroups: rec.games.roguelike.nethack

On Wed, 28 Jun 2000 19:24:07 GMT,
Mark Whitney <[email-masked]> wrote:

>Ray Chason wrote:
>> You say you've fixed some bugs.  Perhaps you could post your patches?
>
>Sure, but they're actually a subset of the ones that Phillip Lucas says
>he's fixed in his reply.  They are just some of the trivial bugs. 

Ok, here are my patches for the trivial bugs, created with diff -i -w. 
I had to increase the maximal line length for this post.

%%%C5, dothrow.c:

196c196,202
< 		else if (is_ammo(otmp)) {
---
>                 else if ((otmp->oclass==GEM_CLASS)?
>                         ((otmp->otyp==ROCK)||
>                          (((otmp->otyp==FLINT)||
>                            (objects[otmp->oclass].oc_material==GLASS))
>                           &&objects[otmp->oclass].oc_name_known))
>                         : is_ammo(otmp))
>                         {

%%%C49, steed.c:

26c26
< 			!humanoid(ptr) && (ptr->msize >= MZ_MEDIUM) &&
---
>                         (!humanoid(ptr)||(ptr->mlet==S_CENTAUR)) && (ptr->msize >= MZ_MEDIUM) &&

%%%C77, objects.c:

639c639
< TOOL("wooden harp", "harp",     0, 0, 1, 0,   4, 30,  50, WOOD, HI_WOOD),
---
> TOOL("wooden harp", "harp",     0, 0, 0, 0,   4, 30,  50, WOOD, HI_WOOD),

%%%C65, read.c:

118c118
< 	if (scroll->otyp != SPE_BOOK_OF_THE_DEAD)
---
>         if ((scroll->otyp != SPE_BOOK_OF_THE_DEAD)&&(scroll->otyp!=SPE_BLANK_PAPER)&&(scroll->otyp!=SCR_BLANK_PAPER))

%%%SC1, eat.c:

980a981
>             u.uconduct.food++;
1233a1235
>         u.uconduct.food++;
1664c1666
< 	u.uconduct.food++;
---
> /*        u.uconduct.food++; */

%%%SC2, spell.c:

668c668
< 		if (spellid(spell) != SPE_DETECT_FOOD) {
---
>                 if ((spellid(spell) != SPE_DETECT_FOOD)&&(Role_if(PM_WIZARD))) {
682c682
< 			 * 1. int = 17-18 no reduction
---
>                          * 1. int > 16 no reduction
692a693
>                         if (intell>16) hungr=0; else
694,695d694
< 				case 18:
< 				case 17: hungr = 0; break;

%%%SC9, monst.c

1188c1188
< 	M2_HOSTILE|M2_STRONG|M2_GREEDY|M2_JEWELS, M3_INFRAVISIBLE, CLR_GRAY),
---
>         M2_HOSTILE|M2_STRONG|M2_GREEDY|M2_JEWELS, 0, CLR_GRAY),

%%%SC10, attrib.c:

601c601
< 	int	hp, conplus;
---
>         int     hp, conplus,con_dummy;
627,628c627,630
< 	switch(ACURR(A_CON)) {
< 		case	3:	conplus = -2; break;
---
>         con_dummy=ACURR(A_CON);
>         if (con_dummy<4) conplus=-2; else
>          if (con_dummy>17) conplus=3; else
>           switch(con_dummy) {
635d636
< 		case	18:	conplus = 3; break;

-- 
Philipp Lucas
[email-masked]