more win32 de-MICRO
This commit is contained in:
14
src/end.c
14
src/end.c
@@ -58,7 +58,11 @@ extern void FDECL(nethack_exit,(int));
|
|||||||
# ifdef SYSV
|
# ifdef SYSV
|
||||||
# define NH_abort() (void) abort()
|
# define NH_abort() (void) abort()
|
||||||
# else
|
# else
|
||||||
|
# ifdef WIN32
|
||||||
|
# define NH_abort() win32_abort()
|
||||||
|
# else
|
||||||
# define NH_abort() abort()
|
# define NH_abort() abort()
|
||||||
|
# endif
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -266,12 +270,10 @@ panic VA_DECL(const char *, str)
|
|||||||
#if defined(WIZARD) && !defined(MICRO)
|
#if defined(WIZARD) && !defined(MICRO)
|
||||||
# if defined(NOTIFY_NETHACK_BUGS)
|
# if defined(NOTIFY_NETHACK_BUGS)
|
||||||
if (!wizard)
|
if (!wizard)
|
||||||
raw_printf("Report error to \"%s\".\n%s.\n",
|
raw_printf("Report the following error to \"%s\".",
|
||||||
"nethack-bugs@nethack.org",
|
"nethack-bugs@nethack.org");
|
||||||
!program_state.something_worth_saving ? "" :
|
|
||||||
"An error save file will be created.\n");
|
|
||||||
else if (program_state.something_worth_saving)
|
else if (program_state.something_worth_saving)
|
||||||
raw_print("\nAn error save file will be created.\n");
|
raw_print("\nError save file being written.\n");
|
||||||
# else
|
# else
|
||||||
if (!wizard)
|
if (!wizard)
|
||||||
raw_printf("Report error to \"%s\"%s.",
|
raw_printf("Report error to \"%s\"%s.",
|
||||||
@@ -293,7 +295,7 @@ panic VA_DECL(const char *, str)
|
|||||||
Vsprintf(buf,str,VA_ARGS);
|
Vsprintf(buf,str,VA_ARGS);
|
||||||
raw_print(buf);
|
raw_print(buf);
|
||||||
}
|
}
|
||||||
#if defined(WIZARD) && (defined(UNIX) || defined(VMS) || defined(LATTICE))
|
#if defined(WIZARD) && (defined(UNIX) || defined(VMS) || defined(LATTICE) || defined(WIN32))
|
||||||
if (wizard)
|
if (wizard)
|
||||||
NH_abort(); /* generate core dump */
|
NH_abort(); /* generate core dump */
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -675,7 +675,7 @@ tty_askname()
|
|||||||
if (c == '\b' || c == '\177') {
|
if (c == '\b' || c == '\177') {
|
||||||
if(ct) {
|
if(ct) {
|
||||||
ct--;
|
ct--;
|
||||||
#ifdef MICRO
|
#if defined(MICRO) || defined(WIN32CON)
|
||||||
# if defined(WIN32CON)
|
# if defined(WIN32CON)
|
||||||
backsp(); /* \b is visible on NT */
|
backsp(); /* \b is visible on NT */
|
||||||
# else
|
# else
|
||||||
@@ -700,7 +700,7 @@ tty_askname()
|
|||||||
if(c < 'A' || (c > 'Z' && c < 'a') || c > 'z') c = '_';
|
if(c < 'A' || (c > 'Z' && c < 'a') || c > 'z') c = '_';
|
||||||
#endif
|
#endif
|
||||||
if (ct < (int)(sizeof plname) - 1) {
|
if (ct < (int)(sizeof plname) - 1) {
|
||||||
#if defined(MICRO)
|
#if defined(MICRO) || defined(WIN32CON)
|
||||||
# if defined(MSDOS)
|
# if defined(MSDOS)
|
||||||
if (iflags.grmode) {
|
if (iflags.grmode) {
|
||||||
(void) putchar(c);
|
(void) putchar(c);
|
||||||
@@ -2442,7 +2442,7 @@ tty_raw_print(str)
|
|||||||
const char *str;
|
const char *str;
|
||||||
{
|
{
|
||||||
if(ttyDisplay) ttyDisplay->rawprint++;
|
if(ttyDisplay) ttyDisplay->rawprint++;
|
||||||
#ifdef MICRO
|
#if defined(MICRO) || defined(WIN32CON)
|
||||||
msmsg("%s\n", str);
|
msmsg("%s\n", str);
|
||||||
#else
|
#else
|
||||||
puts(str); (void) fflush(stdout);
|
puts(str); (void) fflush(stdout);
|
||||||
@@ -2455,13 +2455,13 @@ tty_raw_print_bold(str)
|
|||||||
{
|
{
|
||||||
if(ttyDisplay) ttyDisplay->rawprint++;
|
if(ttyDisplay) ttyDisplay->rawprint++;
|
||||||
term_start_raw_bold();
|
term_start_raw_bold();
|
||||||
#ifdef MICRO
|
#if defined(MICRO) || defined(WIN32CON)
|
||||||
msmsg("%s", str);
|
msmsg("%s", str);
|
||||||
#else
|
#else
|
||||||
(void) fputs(str, stdout);
|
(void) fputs(str, stdout);
|
||||||
#endif
|
#endif
|
||||||
term_end_raw_bold();
|
term_end_raw_bold();
|
||||||
#ifdef MICRO
|
#if defined(MICRO) || defined(WIN32CON)
|
||||||
msmsg("\n");
|
msmsg("\n");
|
||||||
#else
|
#else
|
||||||
puts("");
|
puts("");
|
||||||
|
|||||||
Reference in New Issue
Block a user