replace leading tabs in several more files
This commit is contained in:
@@ -388,8 +388,8 @@ E const char *fqn_prefix_names[PREFIX_COUNT];
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
struct restore_info {
|
struct restore_info {
|
||||||
const char *name;
|
const char *name;
|
||||||
int mread_flags;
|
int mread_flags;
|
||||||
};
|
};
|
||||||
E struct restore_info restoreinfo;
|
E struct restore_info restoreinfo;
|
||||||
|
|
||||||
|
|||||||
@@ -664,10 +664,10 @@ enum optset_restrictions {
|
|||||||
/* Cast to int, but limit value to range. */
|
/* Cast to int, but limit value to range. */
|
||||||
#define LIMIT_TO_RANGE_INT(lo, hi, var) \
|
#define LIMIT_TO_RANGE_INT(lo, hi, var) \
|
||||||
(int) ( \
|
(int) ( \
|
||||||
(var) < (lo) ? (lo) : ( \
|
(var) < (lo) ? (lo) : ( \
|
||||||
(var) > (hi) ? (hi) : \
|
(var) > (hi) ? (hi) : \
|
||||||
(var) \
|
(var) \
|
||||||
) \
|
) \
|
||||||
)
|
)
|
||||||
|
|
||||||
#define ARM_BONUS(obj) \
|
#define ARM_BONUS(obj) \
|
||||||
|
|||||||
@@ -297,7 +297,7 @@ BIOSgetch(void)
|
|||||||
if ((shift & ALT) && !ch) {
|
if ((shift & ALT) && !ch) {
|
||||||
#endif
|
#endif
|
||||||
#if 0
|
#if 0
|
||||||
pline("Scan code: %d 0x%03X", scan, scan);
|
pline("Scan code: %d 0x%03X", scan, scan);
|
||||||
#endif
|
#endif
|
||||||
if (inmap(scan))
|
if (inmap(scan))
|
||||||
ch = scanmap[scan - SCANLO];
|
ch = scanmap[scan - SCANLO];
|
||||||
|
|||||||
@@ -338,8 +338,8 @@ void txt_xputc(char ch, int attr)
|
|||||||
switch (ch) {
|
switch (ch) {
|
||||||
case '\n':
|
case '\n':
|
||||||
#if 0
|
#if 0
|
||||||
col = 0;
|
col = 0;
|
||||||
++row;
|
++row;
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -105,22 +105,22 @@ static int viewport_cols = 40;
|
|||||||
static int viewport_rows = ROWNO;
|
static int viewport_rows = ROWNO;
|
||||||
|
|
||||||
static const struct Pixel defpalette[] = { /* Colors for text and the position bar */
|
static const struct Pixel defpalette[] = { /* Colors for text and the position bar */
|
||||||
{ 0x00, 0x00, 0x00, 0xff }, /* CLR_BLACK */
|
{ 0x00, 0x00, 0x00, 0xff }, /* CLR_BLACK */
|
||||||
{ 0xaa, 0x00, 0x00, 0xff }, /* CLR_RED */
|
{ 0xaa, 0x00, 0x00, 0xff }, /* CLR_RED */
|
||||||
{ 0x00, 0xaa, 0x00, 0xff }, /* CLR_GREEN */
|
{ 0x00, 0xaa, 0x00, 0xff }, /* CLR_GREEN */
|
||||||
{ 0x99, 0x40, 0x00, 0xff }, /* CLR_BROWN */
|
{ 0x99, 0x40, 0x00, 0xff }, /* CLR_BROWN */
|
||||||
{ 0x00, 0x00, 0xaa, 0xff }, /* CLR_BLUE */
|
{ 0x00, 0x00, 0xaa, 0xff }, /* CLR_BLUE */
|
||||||
{ 0xaa, 0x00, 0xaa, 0xff }, /* CLR_MAGENTA */
|
{ 0xaa, 0x00, 0xaa, 0xff }, /* CLR_MAGENTA */
|
||||||
{ 0x00, 0xaa, 0xaa, 0xff }, /* CLR_CYAN */
|
{ 0x00, 0xaa, 0xaa, 0xff }, /* CLR_CYAN */
|
||||||
{ 0xaa, 0xaa, 0xaa, 0xff }, /* CLR_GRAY */
|
{ 0xaa, 0xaa, 0xaa, 0xff }, /* CLR_GRAY */
|
||||||
{ 0x55, 0x55, 0x55, 0xff }, /* NO_COLOR */
|
{ 0x55, 0x55, 0x55, 0xff }, /* NO_COLOR */
|
||||||
{ 0xff, 0x90, 0x00, 0xff }, /* CLR_ORANGE */
|
{ 0xff, 0x90, 0x00, 0xff }, /* CLR_ORANGE */
|
||||||
{ 0x00, 0xff, 0x00, 0xff }, /* CLR_BRIGHT_GREEN */
|
{ 0x00, 0xff, 0x00, 0xff }, /* CLR_BRIGHT_GREEN */
|
||||||
{ 0xff, 0xff, 0x00, 0xff }, /* CLR_YELLOW */
|
{ 0xff, 0xff, 0x00, 0xff }, /* CLR_YELLOW */
|
||||||
{ 0x00, 0x00, 0xff, 0xff }, /* CLR_BRIGHT_BLUE */
|
{ 0x00, 0x00, 0xff, 0xff }, /* CLR_BRIGHT_BLUE */
|
||||||
{ 0xff, 0x00, 0xff, 0xff }, /* CLR_BRIGHT_MAGENTA */
|
{ 0xff, 0x00, 0xff, 0xff }, /* CLR_BRIGHT_MAGENTA */
|
||||||
{ 0x00, 0xff, 0xff, 0xff }, /* CLR_BRIGHT_CYAN */
|
{ 0x00, 0xff, 0xff, 0xff }, /* CLR_BRIGHT_CYAN */
|
||||||
{ 0xff, 0xff, 0xff, 0xff } /* CLR_WHITE */
|
{ 0xff, 0xff, 0xff, 0xff } /* CLR_WHITE */
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Information about the selected VESA mode */
|
/* Information about the selected VESA mode */
|
||||||
|
|||||||
@@ -181,23 +181,23 @@ static int viewport_size = 40;
|
|||||||
/* static char bittable[8]= {0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80}; */
|
/* static char bittable[8]= {0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80}; */
|
||||||
#if 0
|
#if 0
|
||||||
static char defpalette[] = { /* Default VGA palette */
|
static char defpalette[] = { /* Default VGA palette */
|
||||||
0x00, 0x00, 0x00,
|
0x00, 0x00, 0x00,
|
||||||
0x00, 0x00, 0xaa,
|
0x00, 0x00, 0xaa,
|
||||||
0x00, 0xaa, 0x00,
|
0x00, 0xaa, 0x00,
|
||||||
0x00, 0xaa, 0xaa,
|
0x00, 0xaa, 0xaa,
|
||||||
0xaa, 0x00, 0x00,
|
0xaa, 0x00, 0x00,
|
||||||
0xaa, 0x00, 0xaa,
|
0xaa, 0x00, 0xaa,
|
||||||
0xaa, 0xaa, 0x00,
|
0xaa, 0xaa, 0x00,
|
||||||
0xaa, 0xaa, 0xaa,
|
0xaa, 0xaa, 0xaa,
|
||||||
0x55, 0x55, 0x55,
|
0x55, 0x55, 0x55,
|
||||||
0xcc, 0xcc, 0xcc,
|
0xcc, 0xcc, 0xcc,
|
||||||
0x00, 0x00, 0xff,
|
0x00, 0x00, 0xff,
|
||||||
0x00, 0xff, 0x00,
|
0x00, 0xff, 0x00,
|
||||||
0xff, 0x00, 0x00,
|
0xff, 0x00, 0x00,
|
||||||
0xff, 0xff, 0x00,
|
0xff, 0xff, 0x00,
|
||||||
0xff, 0x00, 0xff,
|
0xff, 0x00, 0xff,
|
||||||
0xff, 0xff, 0xff
|
0xff, 0xff, 0xff
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef ALTERNATE_VIDEO_METHOD
|
#ifndef ALTERNATE_VIDEO_METHOD
|
||||||
@@ -843,13 +843,13 @@ vga_Finish(void)
|
|||||||
static void
|
static void
|
||||||
vga_NoBorder(int bc)
|
vga_NoBorder(int bc)
|
||||||
{
|
{
|
||||||
union REGS regs;
|
union REGS regs;
|
||||||
|
|
||||||
regs.h.ah = (char)0x10;
|
regs.h.ah = (char)0x10;
|
||||||
regs.h.al = (char)0x01;
|
regs.h.al = (char)0x01;
|
||||||
regs.h.bh = (char)bc;
|
regs.h.bh = (char)bc;
|
||||||
regs.h.bl = 0;
|
regs.h.bl = 0;
|
||||||
(void) int86(VIDEO_BIOS, ®s, ®s);
|
(void) int86(VIDEO_BIOS, ®s, ®s);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -40,31 +40,31 @@ uptodate(int fd)
|
|||||||
{
|
{
|
||||||
#ifdef WANT_GETHDATE
|
#ifdef WANT_GETHDATE
|
||||||
if(fstat(fd, &buf)) {
|
if(fstat(fd, &buf)) {
|
||||||
pline("Cannot get status of saved level? ");
|
pline("Cannot get status of saved level? ");
|
||||||
return(0);
|
return(0);
|
||||||
}
|
}
|
||||||
if(buf.st_mtime < hbuf.st_mtime) {
|
if(buf.st_mtime < hbuf.st_mtime) {
|
||||||
pline("Saved level is out of date. ");
|
pline("Saved level is out of date. ");
|
||||||
return(0);
|
return(0);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
#if (defined(MICRO)) && !defined(NO_FSTAT)
|
#if (defined(MICRO)) && !defined(NO_FSTAT)
|
||||||
if(fstat(fd, &buf)) {
|
if(fstat(fd, &buf)) {
|
||||||
if(g.moves > 1) pline("Cannot get status of saved level? ");
|
if(g.moves > 1) pline("Cannot get status of saved level? ");
|
||||||
else pline("Cannot get status of saved game.");
|
else pline("Cannot get status of saved game.");
|
||||||
return(0);
|
return(0);
|
||||||
}
|
}
|
||||||
if(comp_times(buf.st_mtime)) {
|
if(comp_times(buf.st_mtime)) {
|
||||||
if(g.moves > 1) pline("Saved level is out of date.");
|
if(g.moves > 1) pline("Saved level is out of date.");
|
||||||
else pline("Saved game is out of date. ");
|
else pline("Saved game is out of date. ");
|
||||||
/* This problem occurs enough times we need to give the player
|
/* This problem occurs enough times we need to give the player
|
||||||
* some more information about what causes it, and how to fix.
|
* some more information about what causes it, and how to fix.
|
||||||
*/
|
*/
|
||||||
#ifdef MSDOS
|
#ifdef MSDOS
|
||||||
pline("Make sure that your system's date and time are correct.");
|
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("They must be more current than NetHack.EXE's date/time stamp.");
|
||||||
#endif /* MSDOS */
|
#endif /* MSDOS */
|
||||||
return(0);
|
return(0);
|
||||||
}
|
}
|
||||||
#endif /* MICRO */
|
#endif /* MICRO */
|
||||||
#endif /* WANT_GETHDATE */
|
#endif /* WANT_GETHDATE */
|
||||||
|
|||||||
@@ -3033,8 +3033,8 @@ default_checkinput(
|
|||||||
& RIGHTBUTTON)
|
& RIGHTBUTTON)
|
||||||
*mod = CLICK_2;
|
*mod = CLICK_2;
|
||||||
#if 0 /* middle button */
|
#if 0 /* middle button */
|
||||||
else if (ir->Event.MouseEvent.dwButtonState & MIDBUTTON)
|
else if (ir->Event.MouseEvent.dwButtonState & MIDBUTTON)
|
||||||
*mod = CLICK_3;
|
*mod = CLICK_3;
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -3501,18 +3501,18 @@ ray_checkinput(
|
|||||||
& RIGHTBUTTON)
|
& RIGHTBUTTON)
|
||||||
*mod = CLICK_2;
|
*mod = CLICK_2;
|
||||||
#if 0 /* middle button */
|
#if 0 /* middle button */
|
||||||
else if (ir->Event.MouseEvent.dwButtonState & MIDBUTTON)
|
else if (ir->Event.MouseEvent.dwButtonState & MIDBUTTON)
|
||||||
*mod = CLICK_3;
|
*mod = CLICK_3;
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#if 0
|
#if 0
|
||||||
/* We ignore these types of console events */
|
/* We ignore these types of console events */
|
||||||
else if (ir->EventType == FOCUS_EVENT) {
|
else if (ir->EventType == FOCUS_EVENT) {
|
||||||
}
|
}
|
||||||
else if (ir->EventType == MENU_EVENT) {
|
else if (ir->EventType == MENU_EVENT) {
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
@@ -3808,8 +3808,8 @@ nh340_checkinput(
|
|||||||
& RIGHTBUTTON)
|
& RIGHTBUTTON)
|
||||||
*mod = CLICK_2;
|
*mod = CLICK_2;
|
||||||
#if 0 /* middle button */
|
#if 0 /* middle button */
|
||||||
else if (ir->Event.MouseEvent.dwButtonState & MIDBUTTON)
|
else if (ir->Event.MouseEvent.dwButtonState & MIDBUTTON)
|
||||||
*mod = CLICK_3;
|
*mod = CLICK_3;
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -642,7 +642,7 @@ attempt_restore:
|
|||||||
if (g.program_state.in_self_recover) {
|
if (g.program_state.in_self_recover) {
|
||||||
g.program_state.in_self_recover = FALSE;
|
g.program_state.in_self_recover = FALSE;
|
||||||
set_savefile_name(TRUE);
|
set_savefile_name(TRUE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!resuming) {
|
if (!resuming) {
|
||||||
|
|||||||
@@ -490,8 +490,8 @@ getreturn(const char *str)
|
|||||||
initializing the window port */
|
initializing the window port */
|
||||||
void nethack_enter_windows(void)
|
void nethack_enter_windows(void)
|
||||||
{
|
{
|
||||||
if (WINDOWPORT("tty"))
|
if (WINDOWPORT("tty"))
|
||||||
nethack_enter_consoletty();
|
nethack_enter_consoletty();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* CP437 to Unicode mapping according to the Unicode Consortium */
|
/* CP437 to Unicode mapping according to the Unicode Consortium */
|
||||||
|
|||||||
@@ -3548,7 +3548,7 @@ tty_print_glyph(winid window, xchar x, xchar y,
|
|||||||
ttyDisplay->color = color;
|
ttyDisplay->color = color;
|
||||||
if (color != NO_COLOR)
|
if (color != NO_COLOR)
|
||||||
term_start_color(color);
|
term_start_color(color);
|
||||||
}
|
}
|
||||||
#endif /* TEXTCOLOR */
|
#endif /* TEXTCOLOR */
|
||||||
} /* iflags.use_color aka iflags.wc_color */
|
} /* iflags.use_color aka iflags.wc_color */
|
||||||
|
|
||||||
|
|||||||
@@ -750,59 +750,59 @@ mswin_layout_main_window(HWND changed_child)
|
|||||||
}
|
}
|
||||||
|
|
||||||
VOID CALLBACK FuzzTimerProc(
|
VOID CALLBACK FuzzTimerProc(
|
||||||
_In_ HWND hwnd,
|
_In_ HWND hwnd,
|
||||||
_In_ UINT uMsg,
|
_In_ UINT uMsg,
|
||||||
_In_ UINT_PTR idEvent,
|
_In_ UINT_PTR idEvent,
|
||||||
_In_ DWORD dwTime
|
_In_ DWORD dwTime
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
INPUT input[16];
|
INPUT input[16];
|
||||||
int i_pos = 0;
|
int i_pos = 0;
|
||||||
int c = randomkey();
|
int c = randomkey();
|
||||||
SHORT k = VkKeyScanA(c);
|
SHORT k = VkKeyScanA(c);
|
||||||
BOOL gen_alt = (rn2(50) == 0) && isalpha(c);
|
BOOL gen_alt = (rn2(50) == 0) && isalpha(c);
|
||||||
|
|
||||||
if (!iflags.debug_fuzzer) {
|
if (!iflags.debug_fuzzer) {
|
||||||
KillTimer(hwnd, IDT_FUZZ_TIMER);
|
KillTimer(hwnd, IDT_FUZZ_TIMER);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!GetFocus())
|
if (!GetFocus())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
ZeroMemory(input, sizeof(input));
|
ZeroMemory(input, sizeof(input));
|
||||||
if (gen_alt) {
|
if (gen_alt) {
|
||||||
input[i_pos].type = INPUT_KEYBOARD;
|
input[i_pos].type = INPUT_KEYBOARD;
|
||||||
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE;
|
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE;
|
||||||
input[i_pos].ki.wScan = MapVirtualKey(VK_MENU, 0);
|
input[i_pos].ki.wScan = MapVirtualKey(VK_MENU, 0);
|
||||||
i_pos++;
|
i_pos++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (HIBYTE(k) & 1) {
|
if (HIBYTE(k) & 1) {
|
||||||
input[i_pos].type = INPUT_KEYBOARD;
|
input[i_pos].type = INPUT_KEYBOARD;
|
||||||
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE;
|
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE;
|
||||||
input[i_pos].ki.wScan = MapVirtualKey(VK_LSHIFT, 0);
|
input[i_pos].ki.wScan = MapVirtualKey(VK_LSHIFT, 0);
|
||||||
i_pos++;
|
i_pos++;
|
||||||
}
|
}
|
||||||
|
|
||||||
input[i_pos].type = INPUT_KEYBOARD;
|
input[i_pos].type = INPUT_KEYBOARD;
|
||||||
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE;
|
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE;
|
||||||
input[i_pos].ki.wScan = MapVirtualKey(LOBYTE(k), 0);
|
input[i_pos].ki.wScan = MapVirtualKey(LOBYTE(k), 0);
|
||||||
i_pos++;
|
i_pos++;
|
||||||
|
|
||||||
if (HIBYTE(k) & 1) {
|
if (HIBYTE(k) & 1) {
|
||||||
input[i_pos].type = INPUT_KEYBOARD;
|
input[i_pos].type = INPUT_KEYBOARD;
|
||||||
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP;
|
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP;
|
||||||
input[i_pos].ki.wScan = MapVirtualKey(VK_LSHIFT, 0);
|
input[i_pos].ki.wScan = MapVirtualKey(VK_LSHIFT, 0);
|
||||||
i_pos++;
|
i_pos++;
|
||||||
}
|
}
|
||||||
if (gen_alt) {
|
if (gen_alt) {
|
||||||
input[i_pos].type = INPUT_KEYBOARD;
|
input[i_pos].type = INPUT_KEYBOARD;
|
||||||
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP;
|
input[i_pos].ki.dwFlags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP;
|
||||||
input[i_pos].ki.wScan = MapVirtualKey(VK_MENU, 0);
|
input[i_pos].ki.wScan = MapVirtualKey(VK_MENU, 0);
|
||||||
i_pos++;
|
i_pos++;
|
||||||
}
|
}
|
||||||
SendInput(i_pos, input, sizeof(input[0]));
|
SendInput(i_pos, input, sizeof(input[0]));
|
||||||
}
|
}
|
||||||
|
|
||||||
LRESULT
|
LRESULT
|
||||||
|
|||||||
@@ -756,11 +756,11 @@ onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
|
|||||||
}
|
}
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
case MSNH_MSG_RANDOM_INPUT:
|
case MSNH_MSG_RANDOM_INPUT:
|
||||||
nhassert(0); // unexpected
|
nhassert(0); // unexpected
|
||||||
break;
|
break;
|
||||||
|
|
||||||
} /* end switch(wParam) */
|
} /* end switch(wParam) */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* on WM_CREATE */
|
/* on WM_CREATE */
|
||||||
|
|||||||
@@ -625,7 +625,7 @@ onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
|
|||||||
data->menui.menu.items[new_item].attr = msg_data->attr;
|
data->menui.menu.items[new_item].attr = msg_data->attr;
|
||||||
strncpy(data->menui.menu.items[new_item].str, msg_data->str,
|
strncpy(data->menui.menu.items[new_item].str, msg_data->str,
|
||||||
NHMENU_STR_SIZE);
|
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);
|
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].presel = msg_data->presel;
|
||||||
data->menui.menu.items[new_item].itemflags = msg_data->itemflags;
|
data->menui.menu.items[new_item].itemflags = msg_data->itemflags;
|
||||||
@@ -690,10 +690,10 @@ onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
|
|||||||
}
|
}
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
case MSNH_MSG_RANDOM_INPUT: {
|
case MSNH_MSG_RANDOM_INPUT: {
|
||||||
PostMessage(GetMenuControl(hWnd),
|
PostMessage(GetMenuControl(hWnd),
|
||||||
WM_MSNH_COMMAND, MSNH_MSG_RANDOM_INPUT, 0);
|
WM_MSNH_COMMAND, MSNH_MSG_RANDOM_INPUT, 0);
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -915,10 +915,10 @@ GetMenuControl(HWND hWnd)
|
|||||||
|
|
||||||
data = (PNHMenuWindow) GetWindowLongPtr(hWnd, GWLP_USERDATA);
|
data = (PNHMenuWindow) GetWindowLongPtr(hWnd, GWLP_USERDATA);
|
||||||
|
|
||||||
/* We may continue getting window messages after a window's WM_DESTROY is
|
/* 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. */
|
called. We need to handle the case that USERDATA has been freed. */
|
||||||
if (data == NULL)
|
if (data == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (data->type == MENU_TYPE_TEXT) {
|
if (data->type == MENU_TYPE_TEXT) {
|
||||||
return GetDlgItem(hWnd, IDC_MENU_TEXT);
|
return GetDlgItem(hWnd, IDC_MENU_TEXT);
|
||||||
|
|||||||
@@ -416,9 +416,9 @@ onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
|
|||||||
}
|
}
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
case MSNH_MSG_RANDOM_INPUT:
|
case MSNH_MSG_RANDOM_INPUT:
|
||||||
nhassert(0); // unexpected
|
nhassert(0); // unexpected
|
||||||
break;
|
break;
|
||||||
|
|
||||||
} /* switch( wParam ) */
|
} /* switch( wParam ) */
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -283,9 +283,9 @@ onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case MSNH_MSG_RANDOM_INPUT:
|
case MSNH_MSG_RANDOM_INPUT:
|
||||||
nhassert(0); // unexpected
|
nhassert(0); // unexpected
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -220,9 +220,9 @@ StatusWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||||||
InvalidateRect(hWnd, NULL, TRUE);
|
InvalidateRect(hWnd, NULL, TRUE);
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
case MSNH_MSG_RANDOM_INPUT:
|
case MSNH_MSG_RANDOM_INPUT:
|
||||||
nhassert(0); // unexpected
|
nhassert(0); // unexpected
|
||||||
break;
|
break;
|
||||||
|
|
||||||
} /* end switch( wParam ) { */
|
} /* end switch( wParam ) { */
|
||||||
} break;
|
} break;
|
||||||
|
|||||||
@@ -214,11 +214,11 @@ onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case MSNH_MSG_RANDOM_INPUT: {
|
case MSNH_MSG_RANDOM_INPUT: {
|
||||||
PostMessage(GetDlgItem(hWnd, IDC_TEXT_CONTROL),
|
PostMessage(GetDlgItem(hWnd, IDC_TEXT_CONTROL),
|
||||||
WM_MSNH_COMMAND, MSNH_MSG_RANDOM_INPUT, 0);
|
WM_MSNH_COMMAND, MSNH_MSG_RANDOM_INPUT, 0);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1293,10 +1293,10 @@ print_glyph(window, x, y, glyphinfo, bkglyphinfo)
|
|||||||
window. Glyphs are integers mapped to whatever the window-
|
window. Glyphs are integers mapped to whatever the window-
|
||||||
port wants (symbol, font, color, attributes, ...there's
|
port wants (symbol, font, color, attributes, ...there's
|
||||||
a 1-1 map between glyphs and distinct things on the map).
|
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
|
by some graphical or tiled environments to allow the depiction
|
||||||
to fall against a background consistent with the grid
|
to fall against a background consistent with the grid
|
||||||
around x,y.
|
around x,y.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
@@ -1451,7 +1451,7 @@ mswin_nh_poskey(int *x, int *y, int *mod)
|
|||||||
mswin_main_loop();
|
mswin_main_loop();
|
||||||
|
|
||||||
if (event->type == NHEVENT_MOUSE) {
|
if (event->type == NHEVENT_MOUSE) {
|
||||||
if (iflags.wc_mouse_support) {
|
if (iflags.wc_mouse_support) {
|
||||||
*mod = event->ei.ms.mod;
|
*mod = event->ei.ms.mod;
|
||||||
*x = event->ei.ms.x;
|
*x = event->ei.ms.x;
|
||||||
*y = event->ei.ms.y;
|
*y = event->ei.ms.y;
|
||||||
@@ -2396,22 +2396,22 @@ mswin_read_reg(void)
|
|||||||
char keystring[MAX_PATH];
|
char keystring[MAX_PATH];
|
||||||
int i;
|
int i;
|
||||||
COLORREF default_mapcolors[CLR_MAX] = {
|
COLORREF default_mapcolors[CLR_MAX] = {
|
||||||
RGB(0x55, 0x55, 0x55), /* CLR_BLACK */
|
RGB(0x55, 0x55, 0x55), /* CLR_BLACK */
|
||||||
RGB(0xFF, 0x00, 0x00), /* CLR_RED */
|
RGB(0xFF, 0x00, 0x00), /* CLR_RED */
|
||||||
RGB(0x00, 0x80, 0x00), /* CLR_GREEN */
|
RGB(0x00, 0x80, 0x00), /* CLR_GREEN */
|
||||||
RGB(0xA5, 0x2A, 0x2A), /* CLR_BROWN */
|
RGB(0xA5, 0x2A, 0x2A), /* CLR_BROWN */
|
||||||
RGB(0x00, 0x00, 0xFF), /* CLR_BLUE */
|
RGB(0x00, 0x00, 0xFF), /* CLR_BLUE */
|
||||||
RGB(0xFF, 0x00, 0xFF), /* CLR_MAGENTA */
|
RGB(0xFF, 0x00, 0xFF), /* CLR_MAGENTA */
|
||||||
RGB(0x00, 0xFF, 0xFF), /* CLR_CYAN */
|
RGB(0x00, 0xFF, 0xFF), /* CLR_CYAN */
|
||||||
RGB(0xC0, 0xC0, 0xC0), /* CLR_GRAY */
|
RGB(0xC0, 0xC0, 0xC0), /* CLR_GRAY */
|
||||||
RGB(0xFF, 0xFF, 0xFF), /* NO_COLOR */
|
RGB(0xFF, 0xFF, 0xFF), /* NO_COLOR */
|
||||||
RGB(0xFF, 0xA5, 0x00), /* CLR_ORANGE */
|
RGB(0xFF, 0xA5, 0x00), /* CLR_ORANGE */
|
||||||
RGB(0x00, 0xFF, 0x00), /* CLR_BRIGHT_GREEN */
|
RGB(0x00, 0xFF, 0x00), /* CLR_BRIGHT_GREEN */
|
||||||
RGB(0xFF, 0xFF, 0x00), /* CLR_YELLOW */
|
RGB(0xFF, 0xFF, 0x00), /* CLR_YELLOW */
|
||||||
RGB(0x00, 0xC0, 0xFF), /* CLR_BRIGHT_BLUE */
|
RGB(0x00, 0xC0, 0xFF), /* CLR_BRIGHT_BLUE */
|
||||||
RGB(0xFF, 0x80, 0xFF), /* CLR_BRIGHT_MAGENTA */
|
RGB(0xFF, 0x80, 0xFF), /* CLR_BRIGHT_MAGENTA */
|
||||||
RGB(0x80, 0xFF, 0xFF), /* CLR_BRIGHT_CYAN */
|
RGB(0x80, 0xFF, 0xFF), /* CLR_BRIGHT_CYAN */
|
||||||
RGB(0xFF, 0xFF, 0xFF) /* CLR_WHITE */
|
RGB(0xFF, 0xFF, 0xFF) /* CLR_WHITE */
|
||||||
};
|
};
|
||||||
|
|
||||||
sprintf(keystring, "%s\\%s\\%s\\%s", CATEGORYKEY, COMPANYKEY, PRODUCTKEY,
|
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_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_XP, BL_AC, BL_HD, BL_TIME, BL_HUNGER, BL_HP, BL_HPMAX,
|
||||||
BL_LEVELDESC, BL_EXP, BL_CONDITION
|
BL_LEVELDESC, BL_EXP, BL_CONDITION
|
||||||
-- fldindex could also be BL_FLUSH, which is not really
|
-- fldindex could also be BL_FLUSH, which is not really
|
||||||
a field index, but is a special trigger to tell the
|
a field index, but is a special trigger to tell the
|
||||||
windowport that it should output all changes received
|
windowport that it should output all changes received
|
||||||
to this point. It marks the end of a bot() cycle.
|
to this point. It marks the end of a bot() cycle.
|
||||||
-- fldindex could also be BL_RESET, which is not really
|
-- fldindex could also be BL_RESET, which is not really
|
||||||
a field index, but is a special advisory to to tell the
|
a field index, but is a special advisory to to tell the
|
||||||
windowport that it should redisplay all its status fields,
|
windowport that it should redisplay all its status fields,
|
||||||
even if no changes have been presented to it.
|
even if no changes have been presented to it.
|
||||||
-- ptr is usually a "char *", unless fldindex is BL_CONDITION.
|
-- ptr is usually a "char *", unless fldindex is BL_CONDITION.
|
||||||
If fldindex is BL_CONDITION, then ptr is a long value with
|
If fldindex is BL_CONDITION, then ptr is a long value with
|
||||||
any or none of the following bits set (from botl.h):
|
any or none of the following bits set (from botl.h):
|
||||||
|
|||||||
Reference in New Issue
Block a user