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

Move other add_menu routines to windows.c

Browse Source
This commit is contained in:
Pasi Kallinen
2023-11-13 20:12:47 +02:00
parent 4b79baa55b
commit d2ca1794df
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/extern.h
View File

@@ -177,8 +177,6 @@ extern boolean bones_include_name(const char *);
/* ### botl.c ### */ /* ### botl.c ### */
extern void add_menu_heading(winid, const char *);
extern void add_menu_str(winid, const char *);
extern char *do_statusline1(void); extern char *do_statusline1(void);
extern void check_gold_symbol(void); extern void check_gold_symbol(void);
extern char *do_statusline2(void); extern char *do_statusline2(void);
@@ -3441,6 +3439,8 @@ extern boolean menuitem_invert_test(int, unsigned, boolean);
extern const char *mixed_to_glyphinfo(const char *str, glyph_info *gip); extern const char *mixed_to_glyphinfo(const char *str, glyph_info *gip);
extern void add_menu(winid, const glyph_info *, const ANY_P *, extern void add_menu(winid, const glyph_info *, const ANY_P *,
char, char, int, int, const char *, unsigned int); char, char, int, int, const char *, unsigned int);
extern void add_menu_heading(winid, const char *);
extern void add_menu_str(winid, const char *);
/* ### windows.c ### */ /* ### windows.c ### */

20
src/botl.c
View File

@@ -19,26 +19,6 @@ static const char *rank(void);
static void bot_via_windowport(void); static void bot_via_windowport(void);
static void stat_update_time(void); static void stat_update_time(void);
void
add_menu_heading(winid tmpwin, const char *buf)
{
anything any = cg.zeroany;
add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
iflags.menu_headings.attr, iflags.menu_headings.color,
buf, MENU_ITEMFLAGS_NONE);
}
void
add_menu_str(winid tmpwin, const char *buf)
{
anything any = cg.zeroany;
add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
ATR_NONE, NO_COLOR,
buf, MENU_ITEMFLAGS_NONE);
}
static char * static char *
get_strength_str(void) get_strength_str(void)
{ {

20
src/windows.c
View File

@@ -1619,6 +1619,26 @@ add_menu(
ch, gch, attr, color, str, itemflags); ch, gch, attr, color, str, itemflags);
} }
void
add_menu_heading(winid tmpwin, const char *buf)
{
anything any = cg.zeroany;
add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
iflags.menu_headings.attr, iflags.menu_headings.color,
buf, MENU_ITEMFLAGS_NONE);
}
void
add_menu_str(winid tmpwin, const char *buf)
{
anything any = cg.zeroany;
add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
ATR_NONE, NO_COLOR,
buf, MENU_ITEMFLAGS_NONE);
}
static boolean static boolean
get_menu_coloring(const char *str, int *color, int *attr) get_menu_coloring(const char *str, int *color, int *attr)
{ {