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

warnings cleanup (trunk only)

Browse Source 
This covers the warning cleanup bits no one objected to.
This commit is contained in:
keni
2008-02-20 00:27:56 +00:00
parent 6dee7dc521
commit 5d24f9ab3a
13 changed files with 91 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/options.c
View File

@@ -3137,7 +3137,7 @@ boolean setinitial,setfromfile;
int pick_cnt, pick_idx, opt_idx, pass;
int totalapes = 0, numapes[2] = {0,0};
menu_item *pick_list = (menu_item *)0;
anything any;
anything apany;
char apebuf[1+BUFSZ]; /* so &apebuf[1] is BUFSZ long for getlin() */
struct autopickup_exception *ape;
static struct ape_action {
@@ -3155,12 +3155,12 @@ boolean setinitial,setfromfile;
totalapes = count_ape_maps(&numapes[AP_LEAVE], &numapes[AP_GRAB]);
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
any = zeroany;
apany = zeroany;
for (i = 0; i < SIZE(action_titles); i++) {
any.a_int++;
apany.a_int++;
/* omit list and remove if there aren't any yet */
if (!totalapes && (i == 1 || i == 2)) continue;
add_menu(tmpwin, NO_GLYPH, &any, action_titles[i].letr,
add_menu(tmpwin, NO_GLYPH, &apany, action_titles[i].letr,
0, ATR_NONE, action_titles[i].desc,
#if 0 /* this ought to work but doesn't... */
(action_titles[i].letr == 'x') ? MENU_SELECTED :
@@ -3202,14 +3202,14 @@ boolean setinitial,setfromfile;
for (pass = AP_LEAVE; pass <= AP_GRAB; ++pass) {
if (numapes[pass] == 0) continue;
ape = iflags.autopickup_exceptions[pass];
any = zeroany;
add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
apany = zeroany;
add_menu(tmpwin, NO_GLYPH, &apany, 0, 0, iflags.menu_headings,
(pass == 0) ? "Never pickup" : "Always pickup",
MENU_UNSELECTED);
for (i = 0; i < numapes[pass] && ape; i++) {
any.a_void = (opt_idx == 1) ? 0 : ape;
apany.a_void = (opt_idx == 1) ? 0 : ape;
Sprintf(apebuf, "\"%s\"", ape->pattern);
add_menu(tmpwin, NO_GLYPH, &any,
add_menu(tmpwin, NO_GLYPH, &apany,
0, 0, ATR_NONE, apebuf, MENU_UNSELECTED);
ape = ape->next;
}