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

Merge branch 'win32-x64-working' of https://rodney.nethack.org:20040/git/NHsource into win32-x64-working

Browse Source 
* 'win32-x64-working' of https://rodney.nethack.org:20040/git/NHsource: (27 commits)
  Makefile bit
  gcc Makefile updates for recent file additions
  ...

Conflicts:
	src/files.c
This commit is contained in:
Derek S. Ray
2015-04-15 18:30:13 -04:00
parent df52ba17ec 1354215b97
commit 7c644c1507
54 changed files with 502 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/files.c
+2 -4
View File
@@ -3352,10 +3352,8 @@ int tribpassage;
char *endp;
char line[BUFSZ];
int scopes[4] = {0, SECTIONSCOPE, TITLESCOPE, PASSAGESCOPE};
int scope = 0, section = 0, passage = 0, book = 0;
int linect = 0, passagecnt = 0, targetpassage = 0, textcnt = 0;
char *sectionnm = "", *booknm = "";
int scope = 0;
int linect = 0, passagecnt = 0, targetpassage = 0;
const char *badtranslation = "an incomprehensible foreign translation";
boolean matchedsection = FALSE, matchedtitle = FALSE;
winid tribwin = WIN_ERR;