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

replace leading tabs in several more files

Browse Source
This commit is contained in:
nhmall
2022-05-30 12:38:22 -04:00
parent a8f0e91ddf
commit 4a8deefaa3
19 changed files with 176 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/decl.h
View File

@@ -388,8 +388,8 @@ E const char *fqn_prefix_names[PREFIX_COUNT];
#endif
struct restore_info {
const char *name;
int mread_flags;
const char *name;
int mread_flags;
};
E struct restore_info restoreinfo;

8
include/hack.h
View File

@@ -664,10 +664,10 @@ enum optset_restrictions {
/* Cast to int, but limit value to range. */
#define LIMIT_TO_RANGE_INT(lo, hi, var) \
(int) ( \
(var) < (lo) ? (lo) : ( \
(var) > (hi) ? (hi) : \
(var) \
) \
(var) < (lo) ? (lo) : ( \
(var) > (hi) ? (hi) : \
(var) \
) \
)
#define ARM_BONUS(obj) \

2
sys/msdos/msdos.c
View File

@@ -297,7 +297,7 @@ BIOSgetch(void)
if ((shift & ALT) && !ch) {
#endif
#if 0
pline("Scan code: %d 0x%03X", scan, scan);
pline("Scan code: %d 0x%03X", scan, scan);
#endif
if (inmap(scan))
ch = scanmap[scan - SCANLO];

4
sys/msdos/vidtxt.c
View File

@@ -338,8 +338,8 @@ void txt_xputc(char ch, int attr)
switch (ch) {
case '\n':
#if 0
col = 0;
++row;
col = 0;
++row;
#endif
break;
default:

32
sys/msdos/vidvesa.c
View File

@@ -105,22 +105,22 @@ static int viewport_cols = 40;
static int viewport_rows = ROWNO;
static const struct Pixel defpalette[] = { /* Colors for text and the position bar */
{ 0x00, 0x00, 0x00, 0xff }, /* CLR_BLACK */
{ 0xaa, 0x00, 0x00, 0xff }, /* CLR_RED */
{ 0x00, 0xaa, 0x00, 0xff }, /* CLR_GREEN */
{ 0x99, 0x40, 0x00, 0xff }, /* CLR_BROWN */
{ 0x00, 0x00, 0xaa, 0xff }, /* CLR_BLUE */
{ 0xaa, 0x00, 0xaa, 0xff }, /* CLR_MAGENTA */
{ 0x00, 0xaa, 0xaa, 0xff }, /* CLR_CYAN */
{ 0xaa, 0xaa, 0xaa, 0xff }, /* CLR_GRAY */
{ 0x55, 0x55, 0x55, 0xff }, /* NO_COLOR */
{ 0xff, 0x90, 0x00, 0xff }, /* CLR_ORANGE */
{ 0x00, 0xff, 0x00, 0xff }, /* CLR_BRIGHT_GREEN */
{ 0xff, 0xff, 0x00, 0xff }, /* CLR_YELLOW */
{ 0x00, 0x00, 0xff, 0xff }, /* CLR_BRIGHT_BLUE */
{ 0xff, 0x00, 0xff, 0xff }, /* CLR_BRIGHT_MAGENTA */
{ 0x00, 0xff, 0xff, 0xff }, /* CLR_BRIGHT_CYAN */
{ 0xff, 0xff, 0xff, 0xff } /* CLR_WHITE */
{ 0x00, 0x00, 0x00, 0xff }, /* CLR_BLACK */
{ 0xaa, 0x00, 0x00, 0xff }, /* CLR_RED */
{ 0x00, 0xaa, 0x00, 0xff }, /* CLR_GREEN */
{ 0x99, 0x40, 0x00, 0xff }, /* CLR_BROWN */
{ 0x00, 0x00, 0xaa, 0xff }, /* CLR_BLUE */
{ 0xaa, 0x00, 0xaa, 0xff }, /* CLR_MAGENTA */
{ 0x00, 0xaa, 0xaa, 0xff }, /* CLR_CYAN */
{ 0xaa, 0xaa, 0xaa, 0xff }, /* CLR_GRAY */
{ 0x55, 0x55, 0x55, 0xff }, /* NO_COLOR */
{ 0xff, 0x90, 0x00, 0xff }, /* CLR_ORANGE */
{ 0x00, 0xff, 0x00, 0xff }, /* CLR_BRIGHT_GREEN */
{ 0xff, 0xff, 0x00, 0xff }, /* CLR_YELLOW */
{ 0x00, 0x00, 0xff, 0xff }, /* CLR_BRIGHT_BLUE */
{ 0xff, 0x00, 0xff, 0xff }, /* CLR_BRIGHT_MAGENTA */
{ 0x00, 0xff, 0xff, 0xff }, /* CLR_BRIGHT_CYAN */
{ 0xff, 0xff, 0xff, 0xff } /* CLR_WHITE */
};
/* Information about the selected VESA mode */

46
sys/msdos/vidvga.c
View File

@@ -181,23 +181,23 @@ static int viewport_size = 40;
/* static char bittable[8]= {0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80}; */
#if 0
static char defpalette[] = { /* Default VGA palette */
0x00, 0x00, 0x00,
0x00, 0x00, 0xaa,
0x00, 0xaa, 0x00,
0x00, 0xaa, 0xaa,
0xaa, 0x00, 0x00,
0xaa, 0x00, 0xaa,
0xaa, 0xaa, 0x00,
0xaa, 0xaa, 0xaa,
0x55, 0x55, 0x55,
0xcc, 0xcc, 0xcc,
0x00, 0x00, 0xff,
0x00, 0xff, 0x00,
0xff, 0x00, 0x00,
0xff, 0xff, 0x00,
0xff, 0x00, 0xff,
0xff, 0xff, 0xff
};
0x00, 0x00, 0x00,
0x00, 0x00, 0xaa,
0x00, 0xaa, 0x00,
0x00, 0xaa, 0xaa,
0xaa, 0x00, 0x00,
0xaa, 0x00, 0xaa,
0xaa, 0xaa, 0x00,
0xaa, 0xaa, 0xaa,
0x55, 0x55, 0x55,
0xcc, 0xcc, 0xcc,
0x00, 0x00, 0xff,
0x00, 0xff, 0x00,
0xff, 0x00, 0x00,
0xff, 0xff, 0x00,
0xff, 0x00, 0xff,
0xff, 0xff, 0xff
};
#endif
#ifndef ALTERNATE_VIDEO_METHOD
@@ -843,13 +843,13 @@ vga_Finish(void)
static void
vga_NoBorder(int bc)
{
union REGS regs;
union REGS regs;
regs.h.ah = (char)0x10;
regs.h.al = (char)0x01;
regs.h.bh = (char)bc;
regs.h.bl = 0;
(void) int86(VIDEO_BIOS, &regs, &regs);
regs.h.ah = (char)0x10;
regs.h.al = (char)0x01;
regs.h.bh = (char)bc;
regs.h.bl = 0;
(void) int86(VIDEO_BIOS, &regs, &regs);
}
#endif

30
sys/share/pcunix.c
View File

@@ -40,31 +40,31 @@ uptodate(int fd)
{
#ifdef WANT_GETHDATE
if(fstat(fd, &buf)) {
pline("Cannot get status of saved level? ");
return(0);
pline("Cannot get status of saved level? ");
return(0);
}
if(buf.st_mtime < hbuf.st_mtime) {
pline("Saved level is out of date. ");
return(0);
pline("Saved level is out of date. ");
return(0);
}
#else
#if (defined(MICRO)) && !defined(NO_FSTAT)
if(fstat(fd, &buf)) {
if(g.moves > 1) pline("Cannot get status of saved level? ");
else pline("Cannot get status of saved game.");
return(0);
if(g.moves > 1) pline("Cannot get status of saved level? ");
else pline("Cannot get status of saved game.");
return(0);
}
if(comp_times(buf.st_mtime)) {
if(g.moves > 1) pline("Saved level is out of date.");
else pline("Saved game is out of date. ");
/* This problem occurs enough times we need to give the player
* some more information about what causes it, and how to fix.
*/
if(g.moves > 1) pline("Saved level is out of date.");
else pline("Saved game is out of date. ");
/* This problem occurs enough times we need to give the player
* some more information about what causes it, and how to fix.
*/
#ifdef MSDOS
pline("Make sure that your system's date and time are correct.");
pline("They must be more current than NetHack.EXE's date/time stamp.");
pline("Make sure that your system's date and time are correct.");
pline("They must be more current than NetHack.EXE's date/time stamp.");
#endif /* MSDOS */
return(0);
return(0);
}
#endif /* MICRO */
#endif /* WANT_GETHDATE */

22
sys/windows/consoletty.c
View File

@@ -3033,8 +3033,8 @@ default_checkinput(
& RIGHTBUTTON)
*mod = CLICK_2;
#if 0 /* middle button */
else if (ir->Event.MouseEvent.dwButtonState & MIDBUTTON)
*mod = CLICK_3;
else if (ir->Event.MouseEvent.dwButtonState & MIDBUTTON)
*mod = CLICK_3;
#endif
return 0;
}
@@ -3501,18 +3501,18 @@ ray_checkinput(
& RIGHTBUTTON)
*mod = CLICK_2;
#if 0 /* middle button */
else if (ir->Event.MouseEvent.dwButtonState & MIDBUTTON)
*mod = CLICK_3;
else if (ir->Event.MouseEvent.dwButtonState & MIDBUTTON)
*mod = CLICK_3;
#endif
return 0;
}
}
#if 0
/* We ignore these types of console events */
else if (ir->EventType == FOCUS_EVENT) {
}
else if (ir->EventType == MENU_EVENT) {
}
/* We ignore these types of console events */
else if (ir->EventType == FOCUS_EVENT) {
}
else if (ir->EventType == MENU_EVENT) {
}
#endif
}
} else
@@ -3808,8 +3808,8 @@ nh340_checkinput(
& RIGHTBUTTON)
*mod = CLICK_2;
#if 0 /* middle button */
else if (ir->Event.MouseEvent.dwButtonState & MIDBUTTON)
*mod = CLICK_3;
else if (ir->Event.MouseEvent.dwButtonState & MIDBUTTON)
*mod = CLICK_3;
#endif
return 0;
}

2
sys/windows/windmain.c
View File

@@ -642,7 +642,7 @@ attempt_restore:
if (g.program_state.in_self_recover) {
g.program_state.in_self_recover = FALSE;
set_savefile_name(TRUE);
}
}
}
if (!resuming) {

4
sys/windows/windsys.c
View File

@@ -490,8 +490,8 @@ getreturn(const char *str)
initializing the window port */
void nethack_enter_windows(void)
{
if (WINDOWPORT("tty"))
nethack_enter_consoletty();
if (WINDOWPORT("tty"))
nethack_enter_consoletty();
}
/* CP437 to Unicode mapping according to the Unicode Consortium */

2
win/tty/wintty.c
View File

@@ -3548,7 +3548,7 @@ tty_print_glyph(winid window, xchar x, xchar y,
ttyDisplay->color = color;
if (color != NO_COLOR)
term_start_color(color);
}
}
#endif /* TEXTCOLOR */
} /* iflags.use_color aka iflags.wc_color */

90
win/win32/mhmain.c
View File

@@ -750,59 +750,59 @@ mswin_layout_main_window(HWND changed_child)
}
VOID CALLBACK FuzzTimerProc(
_In_ HWND hwnd,
_In_ UINT uMsg,
_In_ UINT_PTR idEvent,
_In_ DWORD dwTime
)
_In_ HWND hwnd,
_In_ UINT uMsg,
_In_ UINT_PTR idEvent,
_In_ DWORD dwTime
)
{
INPUT input[16];
int i_pos = 0;
int c = randomkey();
SHORT k = VkKeyScanA(c);
BOOL gen_alt = (rn2(50) == 0) && isalpha(c);
INPUT input[16];
int i_pos = 0;
int c = randomkey();
SHORT k = VkKeyScanA(c);
BOOL gen_alt = (rn2(50) == 0) && isalpha(c);
if (!iflags.debug_fuzzer) {
KillTimer(hwnd, IDT_FUZZ_TIMER);
return;
}
if (!iflags.debug_fuzzer) {
KillTimer(hwnd, IDT_FUZZ_TIMER);
return;
}
if (!GetFocus())
if (!GetFocus())
return;
ZeroMemory(input, sizeof(input));
if (gen_alt) {
input[i_pos].type = INPUT_KEYBOARD;
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE;
input[i_pos].ki.wScan = MapVirtualKey(VK_MENU, 0);
i_pos++;
}
ZeroMemory(input, sizeof(input));
if (gen_alt) {
input[i_pos].type = INPUT_KEYBOARD;
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE;
input[i_pos].ki.wScan = MapVirtualKey(VK_MENU, 0);
i_pos++;
}
if (HIBYTE(k) & 1) {
input[i_pos].type = INPUT_KEYBOARD;
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE;
input[i_pos].ki.wScan = MapVirtualKey(VK_LSHIFT, 0);
i_pos++;
}
if (HIBYTE(k) & 1) {
input[i_pos].type = INPUT_KEYBOARD;
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE;
input[i_pos].ki.wScan = MapVirtualKey(VK_LSHIFT, 0);
i_pos++;
}
input[i_pos].type = INPUT_KEYBOARD;
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE;
input[i_pos].ki.wScan = MapVirtualKey(LOBYTE(k), 0);
i_pos++;
input[i_pos].type = INPUT_KEYBOARD;
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE;
input[i_pos].ki.wScan = MapVirtualKey(LOBYTE(k), 0);
i_pos++;
if (HIBYTE(k) & 1) {
input[i_pos].type = INPUT_KEYBOARD;
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP;
input[i_pos].ki.wScan = MapVirtualKey(VK_LSHIFT, 0);
i_pos++;
}
if (gen_alt) {
input[i_pos].type = INPUT_KEYBOARD;
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP;
input[i_pos].ki.wScan = MapVirtualKey(VK_MENU, 0);
i_pos++;
}
SendInput(i_pos, input, sizeof(input[0]));
if (HIBYTE(k) & 1) {
input[i_pos].type = INPUT_KEYBOARD;
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP;
input[i_pos].ki.wScan = MapVirtualKey(VK_LSHIFT, 0);
i_pos++;
}
if (gen_alt) {
input[i_pos].type = INPUT_KEYBOARD;
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP;
input[i_pos].ki.wScan = MapVirtualKey(VK_MENU, 0);
i_pos++;
}
SendInput(i_pos, input, sizeof(input[0]));
}
LRESULT

8
win/win32/mhmap.c
View File

@@ -756,11 +756,11 @@ onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
}
} break;
case MSNH_MSG_RANDOM_INPUT:
nhassert(0); // unexpected
break;
case MSNH_MSG_RANDOM_INPUT:
nhassert(0); // unexpected
break;
} /* end switch(wParam) */
} /* end switch(wParam) */
}
/* on WM_CREATE */

18
win/win32/mhmenu.c
View File

@@ -625,7 +625,7 @@ onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
data->menui.menu.items[new_item].attr = msg_data->attr;
strncpy(data->menui.menu.items[new_item].str, msg_data->str,
NHMENU_STR_SIZE);
/* prevent & being interpreted as a mnemonic start */
/* prevent & being interpreted as a mnemonic start */
strNsubst(data->menui.menu.items[new_item].str, "&", "&&", 0);
data->menui.menu.items[new_item].presel = msg_data->presel;
data->menui.menu.items[new_item].itemflags = msg_data->itemflags;
@@ -690,10 +690,10 @@ onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
}
} break;
case MSNH_MSG_RANDOM_INPUT: {
PostMessage(GetMenuControl(hWnd),
WM_MSNH_COMMAND, MSNH_MSG_RANDOM_INPUT, 0);
} break;
case MSNH_MSG_RANDOM_INPUT: {
PostMessage(GetMenuControl(hWnd),
WM_MSNH_COMMAND, MSNH_MSG_RANDOM_INPUT, 0);
} break;
}
}
@@ -915,10 +915,10 @@ GetMenuControl(HWND hWnd)
data = (PNHMenuWindow) GetWindowLongPtr(hWnd, GWLP_USERDATA);
/* We may continue getting window messages after a window's WM_DESTROY is
called. We need to handle the case that USERDATA has been freed. */
if (data == NULL)
return NULL;
/* We may continue getting window messages after a window's WM_DESTROY is
called. We need to handle the case that USERDATA has been freed. */
if (data == NULL)
return NULL;
if (data->type == MENU_TYPE_TEXT) {
return GetDlgItem(hWnd, IDC_MENU_TEXT);

6
win/win32/mhmsgwnd.c
View File

@@ -416,9 +416,9 @@ onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
}
} break;
case MSNH_MSG_RANDOM_INPUT:
nhassert(0); // unexpected
break;
case MSNH_MSG_RANDOM_INPUT:
nhassert(0); // unexpected
break;
} /* switch( wParam ) */
}

6
win/win32/mhrip.c
View File

@@ -283,9 +283,9 @@ onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
break;
}
case MSNH_MSG_RANDOM_INPUT:
nhassert(0); // unexpected
break;
case MSNH_MSG_RANDOM_INPUT:
nhassert(0); // unexpected
break;
}
}

6
win/win32/mhstatus.c
View File

@@ -220,9 +220,9 @@ StatusWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
InvalidateRect(hWnd, NULL, TRUE);
} break;
case MSNH_MSG_RANDOM_INPUT:
nhassert(0); // unexpected
break;
case MSNH_MSG_RANDOM_INPUT:
nhassert(0); // unexpected
break;
} /* end switch( wParam ) { */
} break;

8
win/win32/mhtext.c
View File

@@ -214,11 +214,11 @@ onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
break;
}
case MSNH_MSG_RANDOM_INPUT: {
PostMessage(GetDlgItem(hWnd, IDC_TEXT_CONTROL),
case MSNH_MSG_RANDOM_INPUT: {
PostMessage(GetDlgItem(hWnd, IDC_TEXT_CONTROL),
WM_MSNH_COMMAND, MSNH_MSG_RANDOM_INPUT, 0);
}
break;
}
break;
}
}

54
win/win32/mswproc.c
View File

@@ -1293,10 +1293,10 @@ print_glyph(window, x, y, glyphinfo, bkglyphinfo)
window. Glyphs are integers mapped to whatever the window-
port wants (symbol, font, color, attributes, ...there's
a 1-1 map between glyphs and distinct things on the map).
-- bkglyphinfo contains a background glyph for potential use
-- bkglyphinfo contains a background glyph for potential use
by some graphical or tiled environments to allow the depiction
to fall against a background consistent with the grid
around x,y.
to fall against a background consistent with the grid
around x,y.
*/
void
@@ -1451,7 +1451,7 @@ mswin_nh_poskey(int *x, int *y, int *mod)
mswin_main_loop();
if (event->type == NHEVENT_MOUSE) {
if (iflags.wc_mouse_support) {
if (iflags.wc_mouse_support) {
*mod = event->ei.ms.mod;
*x = event->ei.ms.x;
*y = event->ei.ms.y;
@@ -2396,22 +2396,22 @@ mswin_read_reg(void)
char keystring[MAX_PATH];
int i;
COLORREF default_mapcolors[CLR_MAX] = {
RGB(0x55, 0x55, 0x55), /* CLR_BLACK */
RGB(0xFF, 0x00, 0x00), /* CLR_RED */
RGB(0x00, 0x80, 0x00), /* CLR_GREEN */
RGB(0xA5, 0x2A, 0x2A), /* CLR_BROWN */
RGB(0x00, 0x00, 0xFF), /* CLR_BLUE */
RGB(0xFF, 0x00, 0xFF), /* CLR_MAGENTA */
RGB(0x00, 0xFF, 0xFF), /* CLR_CYAN */
RGB(0xC0, 0xC0, 0xC0), /* CLR_GRAY */
RGB(0xFF, 0xFF, 0xFF), /* NO_COLOR */
RGB(0xFF, 0xA5, 0x00), /* CLR_ORANGE */
RGB(0x00, 0xFF, 0x00), /* CLR_BRIGHT_GREEN */
RGB(0xFF, 0xFF, 0x00), /* CLR_YELLOW */
RGB(0x00, 0xC0, 0xFF), /* CLR_BRIGHT_BLUE */
RGB(0xFF, 0x80, 0xFF), /* CLR_BRIGHT_MAGENTA */
RGB(0x80, 0xFF, 0xFF), /* CLR_BRIGHT_CYAN */
RGB(0xFF, 0xFF, 0xFF) /* CLR_WHITE */
RGB(0x55, 0x55, 0x55), /* CLR_BLACK */
RGB(0xFF, 0x00, 0x00), /* CLR_RED */
RGB(0x00, 0x80, 0x00), /* CLR_GREEN */
RGB(0xA5, 0x2A, 0x2A), /* CLR_BROWN */
RGB(0x00, 0x00, 0xFF), /* CLR_BLUE */
RGB(0xFF, 0x00, 0xFF), /* CLR_MAGENTA */
RGB(0x00, 0xFF, 0xFF), /* CLR_CYAN */
RGB(0xC0, 0xC0, 0xC0), /* CLR_GRAY */
RGB(0xFF, 0xFF, 0xFF), /* NO_COLOR */
RGB(0xFF, 0xA5, 0x00), /* CLR_ORANGE */
RGB(0x00, 0xFF, 0x00), /* CLR_BRIGHT_GREEN */
RGB(0xFF, 0xFF, 0x00), /* CLR_YELLOW */
RGB(0x00, 0xC0, 0xFF), /* CLR_BRIGHT_BLUE */
RGB(0xFF, 0x80, 0xFF), /* CLR_BRIGHT_MAGENTA */
RGB(0x80, 0xFF, 0xFF), /* CLR_BRIGHT_CYAN */
RGB(0xFF, 0xFF, 0xFF) /* CLR_WHITE */
};
sprintf(keystring, "%s\\%s\\%s\\%s", CATEGORYKEY, COMPANYKEY, PRODUCTKEY,
@@ -3050,14 +3050,14 @@ status_update(int fldindex, genericptr_t ptr, int chg, int percent, int color, u
BL_ALIGN, BL_SCORE, BL_CAP, BL_GOLD, BL_ENE, BL_ENEMAX,
BL_XP, BL_AC, BL_HD, BL_TIME, BL_HUNGER, BL_HP, BL_HPMAX,
BL_LEVELDESC, BL_EXP, BL_CONDITION
-- fldindex could also be BL_FLUSH, which is not really
a field index, but is a special trigger to tell the
windowport that it should output all changes received
-- fldindex could also be BL_FLUSH, which is not really
a field index, but is a special trigger to tell the
windowport that it should output all changes received
to this point. It marks the end of a bot() cycle.
-- fldindex could also be BL_RESET, which is not really
a field index, but is a special advisory to to tell the
windowport that it should redisplay all its status fields,
even if no changes have been presented to it.
-- fldindex could also be BL_RESET, which is not really
a field index, but is a special advisory to to tell the
windowport that it should redisplay all its status fields,
even if no changes have been presented to it.
-- ptr is usually a "char *", unless fldindex is BL_CONDITION.
If fldindex is BL_CONDITION, then ptr is a long value with
any or none of the following bits set (from botl.h):