a few miscellaneous comments
This commit is contained in:
@@ -2568,7 +2568,6 @@ struct ext_func_tab extcmdlist[] = {
|
|||||||
{ '\177', "terrain",
|
{ '\177', "terrain",
|
||||||
"view map without monsters or objects obstructing it",
|
"view map without monsters or objects obstructing it",
|
||||||
doterrain, IFBURIED | AUTOCOMPLETE, NULL },
|
doterrain, IFBURIED | AUTOCOMPLETE, NULL },
|
||||||
/* therecmdmenu does not work as intended, should probably be removed */
|
|
||||||
{ '\0', "therecmdmenu",
|
{ '\0', "therecmdmenu",
|
||||||
"menu of commands you can do from here to adjacent spot",
|
"menu of commands you can do from here to adjacent spot",
|
||||||
dotherecmdmenu, AUTOCOMPLETE | GENERALCMD, NULL },
|
dotherecmdmenu, AUTOCOMPLETE | GENERALCMD, NULL },
|
||||||
|
|||||||
@@ -199,7 +199,8 @@ getpos_help(boolean force, const char *goal)
|
|||||||
}
|
}
|
||||||
skip_non_mons:
|
skip_non_mons:
|
||||||
/* disgusting hack; the alternate selection characters work for any
|
/* disgusting hack; the alternate selection characters work for any
|
||||||
getpos call, but only matter for dowhatis (and doquickwhatis) */
|
getpos call, but only matter for dowhatis (and doquickwhatis,
|
||||||
|
also for dotherecmdmenu's simulated mouse) */
|
||||||
doing_what_is = (goal == what_is_an_unknown_object);
|
doing_what_is = (goal == what_is_an_unknown_object);
|
||||||
if (doing_what_is) {
|
if (doing_what_is) {
|
||||||
Sprintf(kbuf, "'%s' or '%s' or '%s' or '%s'",
|
Sprintf(kbuf, "'%s' or '%s' or '%s' or '%s'",
|
||||||
@@ -663,10 +664,11 @@ truncate_to_map(int *cx, int *cy, schar dx, schar dy)
|
|||||||
*cy += dy;
|
*cy += dy;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* have the player use movement keystrokes to position the cursor at a
|
||||||
|
particular map location, then use one of [.,:;] to pick the spot */
|
||||||
int
|
int
|
||||||
getpos(coord *ccp, boolean force, const char *goal)
|
getpos(coord *ccp, boolean force, const char *goal)
|
||||||
{
|
{
|
||||||
const char *cp;
|
|
||||||
static struct {
|
static struct {
|
||||||
int nhkf, ret;
|
int nhkf, ret;
|
||||||
} const pick_chars_def[] = {
|
} const pick_chars_def[] = {
|
||||||
@@ -690,6 +692,7 @@ getpos(coord *ccp, boolean force, const char *goal)
|
|||||||
NHKF_GETPOS_VALID_PREV
|
NHKF_GETPOS_VALID_PREV
|
||||||
};
|
};
|
||||||
struct _cmd_queue cq, *cmdq;
|
struct _cmd_queue cq, *cmdq;
|
||||||
|
const char *cp;
|
||||||
char pick_chars[6];
|
char pick_chars[6];
|
||||||
char mMoOdDxX[13];
|
char mMoOdDxX[13];
|
||||||
int result = 0;
|
int result = 0;
|
||||||
|
|||||||
@@ -751,26 +751,29 @@ print_glyph(window, x, y, glyphinfo, bkglyphinfo)
|
|||||||
a 1-1 map between glyphs and distinct things on the map).
|
a 1-1 map between glyphs and distinct things on the map).
|
||||||
bkglyphinfo is to render the background behind the glyph.
|
bkglyphinfo is to render the background behind the glyph.
|
||||||
It's not used here.
|
It's not used here.
|
||||||
-- bkglyphinfo contains a background glyph for potential use
|
-- bkglyphinfo contains a background glyph for potential use
|
||||||
by some graphical or tiled environments to allow the depiction
|
by some graphical or tiled environments to allow the
|
||||||
to fall against a background consistent with the grid
|
depiction to fall against a background consistent with
|
||||||
around x,y. If bkglyphinfo->glyph is NO_GLYPH, then the
|
the grid around x,y. If bkglyphinfo->glyph is NO_GLYPH,
|
||||||
parameter should be ignored (do nothing with it).
|
then the parameter should be ignored (do nothing with it).
|
||||||
-- glyph_info struct fields:
|
-- glyph_info struct fields:
|
||||||
int glyph; the display entity
|
int glyph; the display entity
|
||||||
int color; color for window ports not using a tile
|
int color; color for window ports not using a tile
|
||||||
int ttychar; the character mapping for the original tty
|
int ttychar; the character mapping for the original tty
|
||||||
interface. Most or all window ports wanted
|
interface. Most or all window ports wanted
|
||||||
and used this for various things so it is
|
and used this for various things so it is
|
||||||
provided in 3.7+
|
provided in 3.7+
|
||||||
short int symidx; offset into syms array
|
short int symidx; offset into syms array
|
||||||
unsigned glyphflags; more detail about the entity
|
unsigned glyphflags; more detail about the entity
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void
|
void
|
||||||
curses_print_glyph(winid wid, coordxy x, coordxy y,
|
curses_print_glyph(
|
||||||
const glyph_info *glyphinfo, const glyph_info *bkglyphinfo UNUSED)
|
winid wid,
|
||||||
|
coordxy x, coordxy y,
|
||||||
|
const glyph_info *glyphinfo,
|
||||||
|
const glyph_info *bkglyphinfo UNUSED)
|
||||||
{
|
{
|
||||||
int glyph;
|
int glyph;
|
||||||
int ch;
|
int ch;
|
||||||
@@ -807,7 +810,7 @@ curses_print_glyph(winid wid, coordxy x, coordxy y,
|
|||||||
render lava in inverse video so that they look different */
|
render lava in inverse video so that they look different */
|
||||||
if ((special & (MG_BW_LAVA | MG_BW_ICE)) != 0 && iflags.use_inverse) {
|
if ((special & (MG_BW_LAVA | MG_BW_ICE)) != 0 && iflags.use_inverse) {
|
||||||
/* reset_glyphmap() only sets MG_BW_foo if color is off */
|
/* reset_glyphmap() only sets MG_BW_foo if color is off */
|
||||||
attr = A_REVERSE;
|
attr = A_REVERSE;
|
||||||
}
|
}
|
||||||
/* highlight female monsters (wizard mode option) */
|
/* highlight female monsters (wizard mode option) */
|
||||||
if ((special & MG_FEMALE) && iflags.wizmgender) {
|
if ((special & MG_FEMALE) && iflags.wizmgender) {
|
||||||
|
|||||||
Reference in New Issue
Block a user