nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

look_here() arguments

Browse Source 
Add LOOKHERE_NOFLAGS to use instead of 0 for look_here()'s 2nd arg.
Fix the call to look_here() that passed FALSE.
This commit is contained in:
PatR
2022-08-10 18:02:57 -07:00
parent 8a549b0a60
commit 3dac38eb0f
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/hack.h
View File

@@ -128,8 +128,9 @@ enum cost_alteration_types {
#define CXN_NOCORPSE 16 /* suppress " corpse" suffix */ #define CXN_NOCORPSE 16 /* suppress " corpse" suffix */
/* flags for look_here() */ /* flags for look_here() */
#define LOOKHERE_PICKED_SOME 1 #define LOOKHERE_NOFLAGS 0U
#define LOOKHERE_SKIP_DFEATURE 2 #define LOOKHERE_PICKED_SOME 1U
#define LOOKHERE_SKIP_DFEATURE 2U
/* getpos() return values */ /* getpos() return values */
enum getpos_retval { enum getpos_retval {

2
src/invent.c
View File

@@ -4296,7 +4296,7 @@ dolook(void)
MSGTYPE={norep,noshow} "You see here" MSGTYPE={norep,noshow} "You see here"
interfere with feedback from the look-here command */ interfere with feedback from the look-here command */
hide_unhide_msgtypes(TRUE, MSGTYP_MASK_REP_SHOW); hide_unhide_msgtypes(TRUE, MSGTYP_MASK_REP_SHOW);
res = look_here(0, FALSE); res = look_here(0, LOOKHERE_NOFLAGS);
/* restore normal msgtype handling */ /* restore normal msgtype handling */
hide_unhide_msgtypes(FALSE, MSGTYP_MASK_REP_SHOW); hide_unhide_msgtypes(FALSE, MSGTYP_MASK_REP_SHOW);
return res; return res;

4
src/pickup.c
View File

@@ -365,7 +365,7 @@ check_here(boolean picked_some)
{ {
register struct obj *obj; register struct obj *obj;
register int ct = 0; 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 (flags.mention_decor) {
if (describe_decor()) if (describe_decor())
@@ -1025,7 +1025,7 @@ query_objlist(const char *qstr, /* query string */
if ((qflags & FEEL_COCKATRICE) && curr->otyp == CORPSE if ((qflags & FEEL_COCKATRICE) && curr->otyp == CORPSE
&& will_feel_cockatrice(curr, FALSE)) { && will_feel_cockatrice(curr, FALSE)) {
destroy_nhwindow(win); /* stop the menu and revert */ destroy_nhwindow(win); /* stop the menu and revert */
(void) look_here(0, 0); (void) look_here(0, LOOKHERE_NOFLAGS);
unsortloot(&sortedolist); unsortloot(&sortedolist);
return 0; return 0;
} }