remove stray tabs from *.c files and config.h
This commit is contained in:
+1
-1
@@ -273,7 +273,7 @@
|
|||||||
# endif
|
# endif
|
||||||
# ifdef __linux__
|
# ifdef __linux__
|
||||||
# define PANICTRACE
|
# define PANICTRACE
|
||||||
# ifndef NOSTATICFN // may be defined on command line
|
# ifndef NOSTATICFN // may be defined on command line
|
||||||
# define NOSTATICFN
|
# define NOSTATICFN
|
||||||
# endif
|
# endif
|
||||||
# endif
|
# endif
|
||||||
|
|||||||
+1
-1
@@ -614,7 +614,7 @@ savebones(int how, time_t when, struct obj *corpse)
|
|||||||
/* if a bones pool digit is in use, it precedes the bonesid
|
/* if a bones pool digit is in use, it precedes the bonesid
|
||||||
string and isn't recorded in the file */
|
string and isn't recorded in the file */
|
||||||
Sfo_char(nhfp, &c, "bones_count", 1);
|
Sfo_char(nhfp, &c, "bones_count", 1);
|
||||||
Sfo_char(nhfp, bonesid, "bonesid", (int) c); /* DD.nnn */
|
Sfo_char(nhfp, bonesid, "bonesid", (int) c); /* DD.nnn */
|
||||||
savefruitchn(nhfp);
|
savefruitchn(nhfp);
|
||||||
update_mlstmv(); /* update monsters for eventual restoration */
|
update_mlstmv(); /* update monsters for eventual restoration */
|
||||||
savelev(nhfp, ledger_no(&u.uz));
|
savelev(nhfp, ledger_no(&u.uz));
|
||||||
|
|||||||
+1
-1
@@ -2106,7 +2106,7 @@ make_converted_name(const char *filename)
|
|||||||
#endif /* UNIX || WIN32 */
|
#endif /* UNIX || WIN32 */
|
||||||
if (dir) {
|
if (dir) {
|
||||||
finaldirchar = c_eos(dir);
|
finaldirchar = c_eos(dir);
|
||||||
finaldirchar--;
|
finaldirchar--;
|
||||||
if (!(*finaldirchar == '/' || *finaldirchar == '\\'
|
if (!(*finaldirchar == '/' || *finaldirchar == '\\'
|
||||||
|| *finaldirchar == ':')) {
|
|| *finaldirchar == ':')) {
|
||||||
needsep = TRUE;
|
needsep = TRUE;
|
||||||
|
|||||||
+1
-1
@@ -860,7 +860,7 @@ dorecover(NHFILE *nhfp)
|
|||||||
restoreinfo.mread_flags = 1; /* return despite error */
|
restoreinfo.mread_flags = 1; /* return despite error */
|
||||||
while (1) {
|
while (1) {
|
||||||
Sfi_xint8(nhfp, <mp, "gamestate-level_number");
|
Sfi_xint8(nhfp, <mp, "gamestate-level_number");
|
||||||
if (nhfp->eof)
|
if (nhfp->eof)
|
||||||
break;
|
break;
|
||||||
getlev(nhfp, 0, ltmp);
|
getlev(nhfp, 0, ltmp);
|
||||||
#ifdef MICRO
|
#ifdef MICRO
|
||||||
|
|||||||
+2
-2
@@ -54,7 +54,7 @@ dosave(void)
|
|||||||
program_state.done_hup = 0;
|
program_state.done_hup = 0;
|
||||||
#endif
|
#endif
|
||||||
if (dosave0()) {
|
if (dosave0()) {
|
||||||
program_state.savefile_completed++;
|
program_state.savefile_completed++;
|
||||||
u.uhp = -1; /* universal game's over indicator */
|
u.uhp = -1; /* universal game's over indicator */
|
||||||
if (soundprocs.sound_exit_nhsound)
|
if (soundprocs.sound_exit_nhsound)
|
||||||
(*soundprocs.sound_exit_nhsound)("dosave");
|
(*soundprocs.sound_exit_nhsound)("dosave");
|
||||||
@@ -564,7 +564,7 @@ savelevl(NHFILE *nhfp)
|
|||||||
for (x = 0; x < COLNO; x++) {
|
for (x = 0; x < COLNO; x++) {
|
||||||
for (y = 0; y < ROWNO; y++) {
|
for (y = 0; y < ROWNO; y++) {
|
||||||
Sfo_rm(nhfp, &levl[x][y], "location-rm");
|
Sfo_rm(nhfp, &levl[x][y], "location-rm");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -506,7 +506,7 @@ bwrite(int fd, const genericptr_t loc, unsigned num)
|
|||||||
fprintf(ofp[fd], "%08ld, %08ld, %d\n", ocnt,
|
fprintf(ofp[fd], "%08ld, %08ld, %d\n", ocnt,
|
||||||
ftell(ofp[fd]), num);
|
ftell(ofp[fd]), num);
|
||||||
ocnt++;
|
ocnt++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -559,7 +559,7 @@ mread(int fd, genericptr_t buf, unsigned len)
|
|||||||
fprintf(ifp[fd], "%08ld, %08ld, %d\n", icnt,
|
fprintf(ifp[fd], "%08ld, %08ld, %d\n", icnt,
|
||||||
ftell(ifp[fd]), (int) len);
|
ftell(ifp[fd]), (int) len);
|
||||||
icnt++;
|
icnt++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
+5
-5
@@ -40,10 +40,10 @@ extern int attrib_gr_intense; /* graphics mode intense attribute */
|
|||||||
|
|
||||||
#if defined(SCREEN_BIOS) && !defined(PC9800)
|
#if defined(SCREEN_BIOS) && !defined(PC9800)
|
||||||
static unsigned char cursor_info = 0,
|
static unsigned char cursor_info = 0,
|
||||||
cursor_start_scanline = 6, cursor_end_scanline = 7;
|
cursor_start_scanline = 6, cursor_end_scanline = 7;
|
||||||
|
|
||||||
static void get_cursinfo(unsigned char *start, unsigned char *end,
|
static void get_cursinfo(unsigned char *start, unsigned char *end,
|
||||||
unsigned char *flg);
|
unsigned char *flg);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void
|
void
|
||||||
@@ -414,8 +414,8 @@ void txt_get_cursor(int *x, int *y)
|
|||||||
*y = regs.h.dh;
|
*y = regs.h.dh;
|
||||||
if (!cursor_info) {
|
if (!cursor_info) {
|
||||||
cursor_start_scanline = regs.h.ch;
|
cursor_start_scanline = regs.h.ch;
|
||||||
cursor_end_scanline = regs.h.cl;
|
cursor_end_scanline = regs.h.cl;
|
||||||
cursor_info = 1;
|
cursor_info = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -464,7 +464,7 @@ get_cursinfo(uchar *start, uchar *end, uchar *flg)
|
|||||||
*end = regs.h.cl;
|
*end = regs.h.cl;
|
||||||
} else {
|
} else {
|
||||||
*start = 6;
|
*start = 6;
|
||||||
*end = 7;
|
*end = 7;
|
||||||
}
|
}
|
||||||
*flg = 1;
|
*flg = 1;
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -707,10 +707,10 @@ early_options(int *argc_p, char ***argv_p, char **hackdir_p)
|
|||||||
break;
|
break;
|
||||||
case 's':
|
case 's':
|
||||||
if (argcheck(argc, argv, ARG_SHOWPATHS) == 2) {
|
if (argcheck(argc, argv, ARG_SHOWPATHS) == 2) {
|
||||||
gd.deferred_showpaths = TRUE;
|
gd.deferred_showpaths = TRUE;
|
||||||
gd.deferred_showpaths_dir = *hackdir_p;
|
gd.deferred_showpaths_dir = *hackdir_p;
|
||||||
config_error_done();
|
config_error_done();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
/* check for "-s" request to show scores */
|
/* check for "-s" request to show scores */
|
||||||
if (lopt(arg, ((ArgValDisallowed | ArgErrComplain)
|
if (lopt(arg, ((ArgValDisallowed | ArgErrComplain)
|
||||||
|
|||||||
+1
-1
@@ -82,7 +82,7 @@ main(int argc, char *argv[])
|
|||||||
if (argcheck(argc, argv, ARG_SHOWPATHS) == 2) {
|
if (argcheck(argc, argv, ARG_SHOWPATHS) == 2) {
|
||||||
gd.deferred_showpaths = TRUE;
|
gd.deferred_showpaths = TRUE;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (argcheck(argc, argv, ARG_DEBUG) == 1) {
|
if (argcheck(argc, argv, ARG_DEBUG) == 1) {
|
||||||
argc--;
|
argc--;
|
||||||
argv++;
|
argv++;
|
||||||
|
|||||||
+7
-7
@@ -67,14 +67,14 @@ static char origdir[255] = "";
|
|||||||
*
|
*
|
||||||
* dlb COMMANDoptions arg... files...
|
* dlb COMMANDoptions arg... files...
|
||||||
* commands:
|
* commands:
|
||||||
* dlb x extract all files
|
* dlb x extract all files
|
||||||
* dlb c build the archive
|
* dlb c build the archive
|
||||||
* dlb t list the archive
|
* dlb t list the archive
|
||||||
* options:
|
* options:
|
||||||
* v verbose
|
* v verbose
|
||||||
* f file specify archive file (default DLBFILE)
|
* f file specify archive file (default DLBFILE)
|
||||||
* I file specify file for list of files (default LIBLISTFILE)
|
* I file specify file for list of files (default LIBLISTFILE)
|
||||||
* C dir chdir to dir (used ONCE, not like tar's -C)
|
* C dir chdir to dir (used ONCE, not like tar's -C)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
ATTRNORETURN static void
|
ATTRNORETURN static void
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
/* NetHack 3.7 recover.c $NHDT-Date: 1687547437 2023/06/23 19:10:37 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.33 $ */
|
/* NetHack 3.7 recover.c $NHDT-Date: 1687547437 2023/06/23 19:10:37 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.33 $ */
|
||||||
/* Copyright (c) Janet Walz, 1992. */
|
/* Copyright (c) Janet Walz, 1992. */
|
||||||
/* NetHack may be freely redistributed. See license for details. */
|
/* NetHack may be freely redistributed. See license for details. */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
+9
-9
@@ -1,5 +1,5 @@
|
|||||||
/* NetHack 3.7 sfctool.c */
|
/* NetHack 3.7 sfctool.c */
|
||||||
/* Copyright (c) Michael Allison, 2025. */
|
/* Copyright (c) Michael Allison, 2025. */
|
||||||
/* NetHack may be freely redistributed. See license for details. */
|
/* NetHack may be freely redistributed. See license for details. */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -318,18 +318,18 @@ process_savefile(const char *srcfnam, enum saveformats srcstyle,
|
|||||||
cscbuf[5]); /* ptr */
|
cscbuf[5]); /* ptr */
|
||||||
if (sfstatus > SF_UPTODATE
|
if (sfstatus > SF_UPTODATE
|
||||||
&& ((sfstatus <= SF_CRITICAL_BYTE_COUNT_MISMATCH) || !unconvert)) {
|
&& ((sfstatus <= SF_CRITICAL_BYTE_COUNT_MISMATCH) || !unconvert)) {
|
||||||
if (sfstatus == SF_OUTDATED) {
|
if (sfstatus == SF_OUTDATED) {
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"The %s savefile is outdated with respect to this %d.%d.%d EDITLEVEL %ld "
|
"The %s savefile is outdated with respect to this %d.%d.%d EDITLEVEL %ld "
|
||||||
"%s%s%s.\n",
|
"%s%s%s.\n",
|
||||||
briefname(srcfnam),
|
briefname(srcfnam),
|
||||||
VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL,
|
VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL,
|
||||||
(long) EDITLEVEL,
|
(long) EDITLEVEL,
|
||||||
thisdatamodel ? thisdatamodel : "",
|
thisdatamodel ? thisdatamodel : "",
|
||||||
thisdatamodel ? " " : "",
|
thisdatamodel ? " " : "",
|
||||||
"sfctool");
|
"sfctool");
|
||||||
return 0;
|
return 0;
|
||||||
} else {
|
} else {
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"The %s savefile %s%s%s not compatible with this %s%s %s utility.\n",
|
"The %s savefile %s%s%s not compatible with this %s%s %s utility.\n",
|
||||||
briefname(srcfnam),
|
briefname(srcfnam),
|
||||||
@@ -338,9 +338,9 @@ process_savefile(const char *srcfnam, enum saveformats srcstyle,
|
|||||||
dmfile ? " savefile, thus" : " is",
|
dmfile ? " savefile, thus" : " is",
|
||||||
thisdatamodel ? thisdatamodel : "",
|
thisdatamodel ? thisdatamodel : "",
|
||||||
thisdatamodel ? " " : "",
|
thisdatamodel ? " " : "",
|
||||||
"sfctool");
|
"sfctool");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (sfstatus >= SF_DM_IL32LLP64_ON_ILP32LL64) {
|
if (sfstatus >= SF_DM_IL32LLP64_ON_ILP32LL64) {
|
||||||
renidx = sfstatus - SF_DM_IL32LLP64_ON_ILP32LL64;
|
renidx = sfstatus - SF_DM_IL32LLP64_ON_ILP32LL64;
|
||||||
|
|||||||
+8
-8
@@ -1,9 +1,9 @@
|
|||||||
/* NetHack 3.6 sftags.c $Date$ $Revision$ */
|
/* NetHack 3.6 sftags.c $Date$ $Revision$ */
|
||||||
/* Copyright (c) Michael Allison, 2025 */
|
/* Copyright (c) Michael Allison, 2025 */
|
||||||
/* NetHack may be freely redistributed. See license for details. */
|
/* NetHack may be freely redistributed. See license for details. */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Read the given ctags file and generate:
|
* Read the given ctags file and generate:
|
||||||
* Intermediate temp files:
|
* Intermediate temp files:
|
||||||
* include/sfo_proto.tmp
|
* include/sfo_proto.tmp
|
||||||
* include/sfi_proto.tmp
|
* include/sfi_proto.tmp
|
||||||
@@ -45,12 +45,12 @@
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NHTYPE_SIMPLE 1
|
#define NHTYPE_SIMPLE 1
|
||||||
#define NHTYPE_COMPLEX 2
|
#define NHTYPE_COMPLEX 2
|
||||||
struct nhdatatypes_t {
|
struct nhdatatypes_t {
|
||||||
uint dtclass;
|
uint dtclass;
|
||||||
char *dtype;
|
char *dtype;
|
||||||
size_t dtsize;
|
size_t dtsize;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct tagstruct {
|
struct tagstruct {
|
||||||
@@ -867,7 +867,7 @@ findtype(char *st, char *tag)
|
|||||||
/* comma or semicolon immediately following tag */
|
/* comma or semicolon immediately following tag */
|
||||||
else {
|
else {
|
||||||
volatile int y = 0;
|
volatile int y = 0;
|
||||||
nhUse(y);
|
nhUse(y);
|
||||||
y = 1;
|
y = 1;
|
||||||
}
|
}
|
||||||
if (strncmpi(ftbuf, "struct ", 7) == 0)
|
if (strncmpi(ftbuf, "struct ", 7) == 0)
|
||||||
|
|||||||
+7
-7
@@ -28,16 +28,16 @@ int main(int argc UNUSED, char *argv[] UNUSED)
|
|||||||
while (!stop) {
|
while (!stop) {
|
||||||
if ((fread(buf, 1, 1, stdin)) > 0) {
|
if ((fread(buf, 1, 1, stdin)) > 0) {
|
||||||
if (*cp == 8) {
|
if (*cp == 8) {
|
||||||
*prev = 0;
|
*prev = 0;
|
||||||
} else {
|
} else {
|
||||||
if (*prev)
|
if (*prev)
|
||||||
fputc(*prev, stdout);
|
fputc(*prev, stdout);
|
||||||
*prev = *cp;
|
*prev = *cp;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (errno != EOF)
|
if (errno != EOF)
|
||||||
trouble = 1;
|
trouble = 1;
|
||||||
if (*prev)
|
if (*prev)
|
||||||
fputc(*prev, stdout);
|
fputc(*prev, stdout);
|
||||||
stop = 1;
|
stop = 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -622,7 +622,7 @@ curses_putmixed(winid window, int attr, const char *str)
|
|||||||
/* now send buf to the normal putstr */
|
/* now send buf to the normal putstr */
|
||||||
curses_putstr(window, attr, buf);
|
curses_putstr(window, attr, buf);
|
||||||
done_output = TRUE;
|
done_output = TRUE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!done_output) {
|
if (!done_output) {
|
||||||
@@ -824,11 +824,11 @@ curses_ctrl_nhwindow(
|
|||||||
case request_settings:
|
case request_settings:
|
||||||
break;
|
break;
|
||||||
case set_menu_promptstyle:
|
case set_menu_promptstyle:
|
||||||
curses_menu_promptstyle.color = wri->fromcore.menu_promptstyle.color;
|
curses_menu_promptstyle.color = wri->fromcore.menu_promptstyle.color;
|
||||||
if (curses_menu_promptstyle.color == NO_COLOR)
|
if (curses_menu_promptstyle.color == NO_COLOR)
|
||||||
curses_menu_promptstyle.color = NONE;
|
curses_menu_promptstyle.color = NONE;
|
||||||
attr = wri->fromcore.menu_promptstyle.attr;
|
attr = wri->fromcore.menu_promptstyle.attr;
|
||||||
curses_menu_promptstyle.attr = curses_convert_attr(attr);;
|
curses_menu_promptstyle.attr = curses_convert_attr(attr);;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|||||||
+1
-1
@@ -764,7 +764,7 @@ onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
|
|||||||
msg_data->buffer[index++] = '\r';
|
msg_data->buffer[index++] = '\r';
|
||||||
msg_data->buffer[index++] = '\n';
|
msg_data->buffer[index++] = '\n';
|
||||||
}
|
}
|
||||||
nhUse(mgch);
|
nhUse(mgch);
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
#ifdef ENHANCED_SYMBOLS
|
#ifdef ENHANCED_SYMBOLS
|
||||||
|
|||||||
@@ -259,7 +259,7 @@ NHSplashWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||||||
DrawText(hdc, VersionString, strlen(VersionString), &rt,
|
DrawText(hdc, VersionString, strlen(VersionString), &rt,
|
||||||
DT_LEFT | DT_NOPREFIX);
|
DT_LEFT | DT_NOPREFIX);
|
||||||
EndPaint(hWnd, &ps);
|
EndPaint(hWnd, &ps);
|
||||||
nhUse(OldFont);
|
nhUse(OldFont);
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
case WM_COMMAND:
|
case WM_COMMAND:
|
||||||
|
|||||||
+2
-2
@@ -379,8 +379,8 @@ prompt_for_player_selection(void)
|
|||||||
* bottom of the window.
|
* bottom of the window.
|
||||||
*/
|
*/
|
||||||
/* tty_clear_nhwindow(BASE_WINDOW) */
|
/* tty_clear_nhwindow(BASE_WINDOW) */
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
if (pick4u != 'y' && pick4u != 'n') {
|
if (pick4u != 'y' && pick4u != 'n') {
|
||||||
give_up: /* Quit */
|
give_up: /* Quit */
|
||||||
if (selected)
|
if (selected)
|
||||||
|
|||||||
Reference in New Issue
Block a user