From f935974e022a9638394e0aac6d172b3dfa7cf018 Mon Sep 17 00:00:00 2001 From: "nethack.allison" Date: Wed, 10 Dec 2003 01:23:14 +0000 Subject: [PATCH] apply Janet's lint catches to trunk --- include/extern.h | 2 ++ src/dog.c | 3 ++- src/eat.c | 2 +- src/polyself.c | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/extern.h b/include/extern.h index 37846cffd..4afefe71d 100644 --- a/include/extern.h +++ b/include/extern.h @@ -1543,7 +1543,9 @@ E int FDECL(loot_mon, (struct monst *,int *,boolean *)); E int NDECL(dotip); E const char *FDECL(safe_qbuf, (const char *,unsigned, const char *,const char *,const char *)); +#ifdef AUTOPICKUP_EXCEPTIONS E boolean FDECL(is_autopickup_exception, (struct obj *, BOOLEAN_P)); +#endif /* AUTOPICKUP_EXCEPTIONS */ /* ### pline.c ### */ diff --git a/src/dog.c b/src/dog.c index 45073ff1e..0c99ff768 100644 --- a/src/dog.c +++ b/src/dog.c @@ -374,7 +374,8 @@ boolean with_you; if (xlocale && ylocale) place_object(obj, xlocale, ylocale); else if (rloco(obj)) { - get_obj_location(obj, &xlocale, &ylocale, 0); + if (!get_obj_location(obj, &xlocale, &ylocale, 0)) + impossible("Can't find relocated object."); } } corpse = mkcorpstat(CORPSE, (struct monst *)0, mtmp->data, diff --git a/src/eat.c b/src/eat.c index 85b872e1c..55fbcc3e6 100644 --- a/src/eat.c +++ b/src/eat.c @@ -894,7 +894,7 @@ register int pm; if (dmgtype(ptr, AD_STUN) || dmgtype(ptr, AD_HALU) || pm == PM_VIOLET_FUNGUS) { pline ("Oh wow! Great stuff!"); - make_hallucinated(HHallucination + 200,FALSE,0L); + (void) make_hallucinated(HHallucination + 200,FALSE,0L); } if(is_giant(ptr)) gainstr((struct obj *)0, 0); diff --git a/src/polyself.c b/src/polyself.c index f7720d046..d807d8c84 100644 --- a/src/polyself.c +++ b/src/polyself.c @@ -329,7 +329,8 @@ boolean forcecontrol; } if (is_pool(u.ux,u.uy) && was_floating && !(Levitation || Flying) && !breathless(youmonst.data) && !amphibious(youmonst.data) && - !Swimming) drown(); + !Swimming) + (void) drown(); } /* (try to) make a mntmp monster out of the player */ -- 2.40.0