diff --git a/include/extern.h b/include/extern.h index 745bded6c..59a4c39f9 100644 --- a/include/extern.h +++ b/include/extern.h @@ -177,8 +177,6 @@ extern boolean bones_include_name(const char *); /* ### botl.c ### */ -extern void add_menu_heading(winid, const char *); -extern void add_menu_str(winid, const char *); extern char *do_statusline1(void); extern void check_gold_symbol(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 void add_menu(winid, const glyph_info *, const ANY_P *, 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 ### */ diff --git a/src/botl.c b/src/botl.c index d148e660e..c5132dc85 100644 --- a/src/botl.c +++ b/src/botl.c @@ -19,26 +19,6 @@ static const char *rank(void); static void bot_via_windowport(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 * get_strength_str(void) { diff --git a/src/windows.c b/src/windows.c index 894e2213f..a29dbabe0 100644 --- a/src/windows.c +++ b/src/windows.c @@ -1619,6 +1619,26 @@ add_menu( 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 get_menu_coloring(const char *str, int *color, int *attr) {