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

Merge branch 'paxed-lua-merged3' into paxed-lua-v2-merged

Browse Source
This commit is contained in:
nhmall
2019-11-06 12:56:21 -05:00
parent 9cd9280276 a7e3129919
commit bcb627100b
252 changed files with 9504 additions and 6526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sys/share/pcmain.c
View File

@@ -7,6 +7,7 @@
#include "hack.h"
#include "dlb.h"
#include "sfproto.h"
#ifndef NO_SIGNAL
#include <signal.h>
@@ -40,8 +41,8 @@ extern int bigscreen;
void NDECL(preserve_icon);
#endif
STATIC_DCL void FDECL(process_options, (int argc, char **argv));
STATIC_DCL void NDECL(nhusage);
static void FDECL(process_options, (int argc, char **argv));
static void NDECL(nhusage);
#if defined(MICRO) || defined(OS2)
extern void FDECL(nethack_exit, (int));
@@ -50,7 +51,7 @@ extern void FDECL(nethack_exit, (int));
#endif
#ifdef EXEPATH
STATIC_DCL char *FDECL(exepath, (char *));
static char *FDECL(exepath, (char *));
#endif
int FDECL(main, (int, char **));
@@ -530,7 +531,7 @@ attempt_restore:
return resuming;
}
STATIC_OVL void
static void
process_options(argc, argv)
int argc;
char *argv[];
@@ -661,7 +662,7 @@ char *argv[];
}
}
STATIC_OVL void
static void
nhusage()
{
char buf1[BUFSZ], buf2[BUFSZ], *bufptr;

12
sys/share/pcsys.c
View File

@@ -33,7 +33,7 @@ void FDECL(nethack_exit, (int));
#else
#define nethack_exit exit
#endif
STATIC_DCL void NDECL(msexit);
static void NDECL(msexit);
#ifdef MOVERLAY
extern void __far __cdecl _movepause(void);
@@ -45,9 +45,9 @@ extern unsigned short __far __cdecl _movefpaused;
#endif /* MOVERLAY */
#ifdef MFLOPPY
STATIC_DCL boolean NDECL(record_exists);
static boolean NDECL(record_exists);
#ifndef TOS
STATIC_DCL boolean NDECL(comspec_exists);
static boolean NDECL(comspec_exists);
#endif
#endif
@@ -305,7 +305,7 @@ int start;
}
/* Return 1 if the record file was found */
STATIC_OVL boolean
static boolean
record_exists()
{
FILE *fp;
@@ -324,7 +324,7 @@ record_exists()
#else
#ifdef MFLOPPY
/* Return 1 if the comspec was found */
STATIC_OVL boolean
static boolean
comspec_exists()
{
int fd;
@@ -492,7 +492,7 @@ int code;
extern boolean run_from_desktop; /* set in pcmain.c */
#endif
STATIC_OVL void
static void
msexit()
{
#ifdef CHDIR

9
sys/share/tclib.c
View File

@@ -27,7 +27,7 @@ int FDECL(tgetnum, (const char *));
char *FDECL(tgetstr, (const char *, char **));
char *FDECL(tgoto, (const char *, int, int));
char *FDECL(tparam, (const char *, char *, int, int, int, int, int));
void FDECL(tputs, (const char *, int, int (*)()));
void FDECL(tputs, (const char *, int, int (*)(int)));
/* local support data */
static char *tc_entry;
@@ -502,9 +502,10 @@ int row, col, row2, col2;
/* send a string to the terminal, possibly padded with trailing NULs */
void
tputs(string, range, output_func)
const char *string; /* characters to output */
int range; /* number of lines affected, used for `*' delays */
int (*output_func)(); /* actual output routine; return value ignored */
const char *string; /* characters to output */
int range; /* number of lines affected, used for `*' delays */
int FDECL((*output_func),(int)); /* actual output routine;
* return value ignored */
{
register int c, num = 0;
register const char *p = string;

6
sys/share/unixtty.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 unixtty.c $NHDT-Date: 1548372343 2019/01/24 23:25:43 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.25 $ */
/* NetHack 3.6 unixtty.c $NHDT-Date: 1570652308 2019/10/09 20:18:28 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.26 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2006. */
/* NetHack may be freely redistributed. See license for details. */
@@ -243,6 +243,7 @@ const char *s;
iflags.cbreak = (CBRKON(inittyb.cbrkflgs & CBRKMASK)) ? ON : OFF;
curttyb.inputflags |= STRIPHI;
setioctls();
settty_needed = FALSE;
}
void
@@ -471,6 +472,9 @@ VA_DECL(const char *, s)
{
VA_START(s);
VA_INIT(s, const char *);
if (iflags.window_inited)
exit_nhwindows((char *) 0); /* for tty, will call settty() */
if (settty_needed)
settty((char *) 0);
Vprintf(s, VA_ARGS);