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

more not PR #1102 - reveal_terrain() args

Browse Source 
From a comment w/ diff in the pull request by entrez, combine the
show-full-map flag (available in wizard mode and explore mode) with
the bitmask for map-only, map-and-traps, map-and-traps-and-objects
flags for #terrain mode (and getpos() help) instead of passing that
as a separate argument.  No change in behavior unless I messed up.
This commit is contained in:
PatR
2023-10-13 18:17:08 -07:00
parent 80b153638b
commit 9e65cd7d80
4 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/extern.h
View File

@@ -369,7 +369,7 @@ extern void sokoban_detect(void);
#ifdef DUMPLOG
extern void dump_map(void);
#endif
extern void reveal_terrain(int, int);
extern void reveal_terrain(unsigned);
extern int wiz_mgender(void);
/* ### dig.c ### */

23
include/flag.h
View File

@@ -207,23 +207,24 @@ struct instance_flags {
int at_midnight; /* only valid during end of game disclosure */
int at_night; /* also only valid during end of game disclosure */
int failing_untrap; /* move_into_trap() -> spoteffects() -> dotrap() */
int getdir_click; /* as input to getdir(): non-zero, accept simulated
* click that's not adjacent to or on hero;
* as output from getdir(): simulated button used
* 0 (none) or CLICK_1 (left) or CLICK_2 (right) */
int getloc_filter; /* GFILTER_foo */
int in_lava_effects; /* hack for Boots_off() */
int last_msg; /* indicator of last message player saw */
int override_ID; /* true to force full identification of objects */
int parse_config_file_src; /* hack for parse_config_line() */
int purge_monsters; /* # of dead monsters still on fmon list */
int suppress_price; /* controls doname() for unpaid objects */
int terrainmode; /* for getpos()'s autodescribe when #terrain is active */
#define TER_MAP 0x01
#define TER_TRP 0x02
#define TER_OBJ 0x04
#define TER_MON 0x08
#define TER_DETECT 0x10 /* detect_foo magic rather than #terrain */
int getdir_click; /* as input to getdir(): non-zero, accept simulated
* click that's not adjacent to or on hero;
* as output from getdir(): simulated button used
* 0 (none) or CLICK_1 (left) or CLICK_2 (right) */
int getloc_filter; /* GFILTER_foo */
unsigned terrainmode; /* for getpos()'s autodescribe during #terrain */
#define TER_MAP 0x01U
#define TER_TRP 0x02U
#define TER_OBJ 0x04U
#define TER_MON 0x08U
#define TER_FULL 0x10U /* explore|wizard mode view full map */
#define TER_DETECT 0x20U /* detect_foo magic rather than #terrain */
boolean bgcolors; /* display background colors on a map position */
boolean getloc_moveskip;
boolean getloc_travelmode;