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

options.c whitespace cleanup

Browse Source 
I ran into a bit of a mess while working on some other minor change.
Remove trailing spaces and tabs, convert multiple spaces into tabs when
appropriate, discard spaces in <space><tab> sequences, plus a couple of very
small reformatting bits.  No change in game behavior, or even any difference
in generated object file once line information is suppressed.  Some of the
whitespace cleanup is for post-3.4.3 code, so the trunk and branch diffs
aren't equivalent.
This commit is contained in:
nethack.rankin
2005-05-15 05:14:30 +00:00
parent 3b4ca7f6eb
commit 887a97026d
1 changed files with 95 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/options.c
+6 -5
View File
@@ -1349,8 +1349,7 @@ boolean tinitial, tfrom_file;
/* WINCAP /* WINCAP
* setting font options */ * setting font options */
fullname = "font"; fullname = "font";
if (!strncmpi(opts, fullname, 4)) if (!strncmpi(opts, fullname, 4)) {
{
int opttype = -1; int opttype = -1;
char *fontopts = opts + 4; char *fontopts = opts + 4;
@@ -1929,7 +1928,7 @@ goodfruit:
} else if (index(valid_settings, c)) { } else if (index(valid_settings, c)) {
prefix_val = c; prefix_val = c;
} else if (c == ' ') { } else if (c == ' ') {
/* do nothing */ ; /* do nothing */
} else } else
badopt = TRUE; badopt = TRUE;
op++; op++;
@@ -2692,7 +2691,7 @@ doset()
opt_indx = pick_list[pick_idx].item.a_int - 1; opt_indx = pick_list[pick_idx].item.a_int - 1;
#ifdef AUTOPICKUP_EXCEPTIONS #ifdef AUTOPICKUP_EXCEPTIONS
if (opt_indx == -2) { /* -3 due to -1 offset for select_menu() */ if (opt_indx == -2) { /* -3 due to -1 offset for select_menu() */
special_handling("autopickup_exception", (void)special_handling("autopickup_exception",
setinitial, fromfile); setinitial, fromfile);
} else } else
#endif #endif
@@ -2841,6 +2840,7 @@ boolean setinitial,setfromfile;
if (disc_cat[i]) { if (disc_cat[i]) {
char dbuf[BUFSZ]; char dbuf[BUFSZ];
menu_item *disclosure_option_pick = (menu_item *)0; menu_item *disclosure_option_pick = (menu_item *)0;
Sprintf(dbuf, "Disclosure options for %s:", disclosure_names[i]); Sprintf(dbuf, "Disclosure options for %s:", disclosure_names[i]);
tmpwin = create_nhwindow(NHW_MENU); tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin); start_menu(tmpwin);
@@ -3023,7 +3023,8 @@ boolean setinitial,setfromfile;
"r", "remove existing autopickup exception", "r", "remove existing autopickup exception",
"e", "exit this menu", "e", "exit this menu",
}; };
ape_again:
ape_again:
opt_idx = 0; opt_idx = 0;
totalapes = count_ape_maps(&numapes[AP_LEAVE], &numapes[AP_GRAB]); totalapes = count_ape_maps(&numapes[AP_LEAVE], &numapes[AP_GRAB]);
tmpwin = create_nhwindow(NHW_MENU); tmpwin = create_nhwindow(NHW_MENU);