From 3dac38eb0f8dd975058c324fa41b2b7ea60fe545 Mon Sep 17 00:00:00 2001 From: PatR Date: Wed, 10 Aug 2022 18:02:57 -0700 Subject: [PATCH] look_here() arguments Add LOOKHERE_NOFLAGS to use instead of 0 for look_here()'s 2nd arg. Fix the call to look_here() that passed FALSE. --- include/hack.h | 5 +++-- src/invent.c | 2 +- src/pickup.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/hack.h b/include/hack.h index e6bf44f9d..6471ac175 100644 --- a/include/hack.h +++ b/include/hack.h @@ -128,8 +128,9 @@ enum cost_alteration_types { #define CXN_NOCORPSE 16 /* suppress " corpse" suffix */ /* flags for look_here() */ -#define LOOKHERE_PICKED_SOME 1 -#define LOOKHERE_SKIP_DFEATURE 2 +#define LOOKHERE_NOFLAGS 0U +#define LOOKHERE_PICKED_SOME 1U +#define LOOKHERE_SKIP_DFEATURE 2U /* getpos() return values */ enum getpos_retval { diff --git a/src/invent.c b/src/invent.c index 2440d7012..d9001b9b5 100644 --- a/src/invent.c +++ b/src/invent.c @@ -4296,7 +4296,7 @@ dolook(void) MSGTYPE={norep,noshow} "You see here" interfere with feedback from the look-here command */ hide_unhide_msgtypes(TRUE, MSGTYP_MASK_REP_SHOW); - res = look_here(0, FALSE); + res = look_here(0, LOOKHERE_NOFLAGS); /* restore normal msgtype handling */ hide_unhide_msgtypes(FALSE, MSGTYP_MASK_REP_SHOW); return res; diff --git a/src/pickup.c b/src/pickup.c index 54704bc44..c7bb2603c 100644 --- a/src/pickup.c +++ b/src/pickup.c @@ -365,7 +365,7 @@ check_here(boolean picked_some) { register struct obj *obj; register int ct = 0; - unsigned lhflags = picked_some ? LOOKHERE_PICKED_SOME : 0; + unsigned lhflags = picked_some ? LOOKHERE_PICKED_SOME : LOOKHERE_NOFLAGS; if (flags.mention_decor) { if (describe_decor()) @@ -1025,7 +1025,7 @@ query_objlist(const char *qstr, /* query string */ if ((qflags & FEEL_COCKATRICE) && curr->otyp == CORPSE && will_feel_cockatrice(curr, FALSE)) { destroy_nhwindow(win); /* stop the menu and revert */ - (void) look_here(0, 0); + (void) look_here(0, LOOKHERE_NOFLAGS); unsortloot(&sortedolist); return 0; }