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

Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource

Browse Source
This commit is contained in:
keni
2015-02-16 08:58:20 -05:00
parent 5dda2afd32 7e93cadc1c
commit bbfb2a4623
5 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+4
View File
@@ -39,6 +39,10 @@ Nethack.sdf
Nethack.opensdf Nethack.opensdf
Makefile.bcc Makefile.bcc
Makefile.gcc Makefile.gcc
Makefile-orig
Makefile.bcc-orig
Makefile.gcc-orig
*.suo
*.pdb *.pdb
*.ilk *.ilk
# Win32-specific ignores end # Win32-specific ignores end
include/decl.h
+1 -1
View File
@@ -341,7 +341,7 @@ E nhwchar toplines[];
#define verbalize1(cstr) verbalize("%s", cstr) #define verbalize1(cstr) verbalize("%s", cstr)
#define You_hear1(cstr) You_hear("%s", cstr) #define You_hear1(cstr) You_hear("%s", cstr)
#define Sprintf1(buf, cstr) Sprintf(buf, "%s", cstr) #define Sprintf1(buf, cstr) Sprintf(buf, "%s", cstr)
#define panic1(cstr) panic(cstr) #define panic1(cstr) panic("%s", cstr)
#ifndef TCAP_H #ifndef TCAP_H
E struct tc_gbl_data { /* also declared in tcap.h */ E struct tc_gbl_data { /* also declared in tcap.h */
src/botl.c
+1 -1
View File
@@ -1353,7 +1353,7 @@ genl_status_init()
vals[i] = (char *)alloc(MAXCO); vals[i] = (char *)alloc(MAXCO);
*vals[i] = '\0'; *vals[i] = '\0';
activefields[i] = FALSE; activefields[i] = FALSE;
fieldfmt[i] = FALSE; fieldfmt[i] = (const char *)0;
} }
/* Use a window for the genl version; backward port compatibility */ /* Use a window for the genl version; backward port compatibility */
WIN_STATUS = create_nhwindow(NHW_STATUS); WIN_STATUS = create_nhwindow(NHW_STATUS);
src/region.c
+1 -1
View File
@@ -1052,7 +1052,7 @@ region_safety()
pline_The("gas cloud has dissipated."); pline_The("gas cloud has dissipated.");
} }
/* maybe cure blindness too */ /* maybe cure blindness too */
if ((Blinded && TIMEOUT) == 1L) make_blinded(0L, TRUE); if ((Blinded & TIMEOUT) == 1L) make_blinded(0L, TRUE);
} }
/*region.c*/ /*region.c*/
sys/share/unixtty.c
+1
View File
@@ -380,6 +380,7 @@ init_sco_cons()
#ifdef __linux__ /* via Jesse Thilo and Ben Gertzfield */ #ifdef __linux__ /* via Jesse Thilo and Ben Gertzfield */
# include <sys/vt.h> # include <sys/vt.h>
# include <sys/ioctl.h>
int linux_flag_console = 0; int linux_flag_console = 0;