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

Merge branch 'NetHack-3.7'

Browse Source
This commit is contained in:
nhmall
2019-12-06 21:59:54 -05:00
parent c4add2680c 4ac02e0cc3
commit 4b7c8d5f0f
7 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+5 -5
View File
@@ -69,6 +69,11 @@ matrix:
sed -i 's/^#define TEXTCOLOR//' include/unixconf.h sed -i 's/^#define TEXTCOLOR//' include/unixconf.h
make fetch-lua && make install make fetch-lua && make install
cat dat/options cat dat/options
- os: windows
env: DESCR=windows-visualstudio
language: shell
script:
- ./win/win32/vs2017/travisci.sh
- os: linux - os: linux
env: DESCR=msdos-cross-on-linux HINTS=linux LUA_VERSION=5.3.5 env: DESCR=msdos-cross-on-linux HINTS=linux LUA_VERSION=5.3.5
compiler: gcc compiler: gcc
@@ -80,11 +85,6 @@ matrix:
- sh sys/msdos/msdos-cross-compile.sh - sh sys/msdos/msdos-cross-compile.sh
exclude: exclude:
- os: windows - os: windows
env: DESCR=windows-visualstudio
language: shell
script:
- ./win/win32/vs2017/travisci.sh
- os: windows
# install: choco install mingw # install: choco install mingw
env: DESCR=windows-mingw env: DESCR=windows-mingw
script: script:
Files
+4 -4
View File
@@ -70,10 +70,10 @@ fixes30.pl05 fixes30.pl06 fixes30.pl07 fixes30.pl08 fixes30.pl09
fixes30.pl10 fixes31.1 fixes31.2 fixes31.3 fixes32.0 fixes30.pl10 fixes31.1 fixes31.2 fixes31.3 fixes32.0
fixes32.1 fixes32.2 fixes32.3 fixes33.0 fixes33.1 fixes32.1 fixes32.2 fixes32.3 fixes33.0 fixes33.1
fixes34.0 fixes34.1 fixes34.2 fixes34.3 fixes35.0 fixes34.0 fixes34.1 fixes34.2 fixes34.3 fixes35.0
fixes36.0 fixes36.1 fixes36.2 fixes36.3 fixes37.0 fixes36.0 fixes36.1 fixes36.2 fixes36.3 fixes36.4
fixesXX.X makedefs.6 makedefs.txt mn.7 mnh.7 fixes37.0 fixesXX.X makedefs.6 makedefs.txt mn.7
nethack.6 nethack.txt recover.6 recover.txt tmac.n mnh.7 nethack.6 nethack.txt recover.6 recover.txt
tmac.nh window.doc tmac.n tmac.nh window.doc
include: include:
(files for GEM versions) (files for GEM versions)
sys/msdos/Makefile1.cross
+3 -3
View File
@@ -309,10 +309,10 @@ $(HOST_O)prereq.tag: $(INCL)/nhlua.h hobj.tag $(U)makedefs \
$(INCL)/nhlua.h: $(INCL)/nhlua.h:
cd $(INCL); \ cd $(INCL); \
echo '/* nhlua.h - generated by Makefile1.cross */' > $@; \ echo '/* nhlua.h - generated by Makefile1.cross */' > $@; \
echo '#include \"../lib/lua-5.3.5/src/lua.h\"' >> $@; \ echo '#include "../lib/lua-5.3.5/src/lua.h"' >> $@; \
sed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < $(LIB)/lua-5.3.5/src/lua.h >> $@; \ sed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < $(LIB)/lua-5.3.5/src/lua.h >> $@; \
echo '#include \"../lib/lua-5.3.5/src/lualib.h\"' >> $@; \ echo '#include "../lib/lua-5.3.5/src/lualib.h"' >> $@; \
echo '#include \"../lib/lua-5.3.5/src/lauxlib.h\"' >> $@; \ echo '#include "../lib/lua-5.3.5/src/lauxlib.h"' >> $@; \
echo '/*nhlua.h*/' >> $@; \ echo '/*nhlua.h*/' >> $@; \
cd $(SRC) cd $(SRC)
sys/unix/unixmain.c
+11 -10
View File
@@ -498,12 +498,13 @@ boolean wr;
#ifdef VAR_PLAYGROUND #ifdef VAR_PLAYGROUND
int len = strlen(VAR_PLAYGROUND); int len = strlen(VAR_PLAYGROUND);
fqn_prefix[SCOREPREFIX] = (char *) alloc(len + 2); g.fqn_prefix[SCOREPREFIX] = (char *) alloc(len + 2);
Strcpy(fqn_prefix[SCOREPREFIX], VAR_PLAYGROUND); Strcpy(g.fqn_prefix[SCOREPREFIX], VAR_PLAYGROUND);
if (fqn_prefix[SCOREPREFIX][len - 1] != '/') { if (g.fqn_prefix[SCOREPREFIX][len - 1] != '/') {
fqn_prefix[SCOREPREFIX][len] = '/'; g.fqn_prefix[SCOREPREFIX][len] = '/';
fqn_prefix[SCOREPREFIX][len + 1] = '\0'; g.fqn_prefix[SCOREPREFIX][len + 1] = '\0';
} }
#endif #endif
} }
@@ -523,11 +524,11 @@ boolean wr;
*/ */
if (wr) { if (wr) {
#ifdef VAR_PLAYGROUND #ifdef VAR_PLAYGROUND
fqn_prefix[LEVELPREFIX] = fqn_prefix[SCOREPREFIX]; g.fqn_prefix[LEVELPREFIX] = g.fqn_prefix[SCOREPREFIX];
fqn_prefix[SAVEPREFIX] = fqn_prefix[SCOREPREFIX]; g.fqn_prefix[SAVEPREFIX] = g.fqn_prefix[SCOREPREFIX];
fqn_prefix[BONESPREFIX] = fqn_prefix[SCOREPREFIX]; g.fqn_prefix[BONESPREFIX] = g.fqn_prefix[SCOREPREFIX];
fqn_prefix[LOCKPREFIX] = fqn_prefix[SCOREPREFIX]; g.fqn_prefix[LOCKPREFIX] = g.fqn_prefix[SCOREPREFIX];
fqn_prefix[TROUBLEPREFIX] = fqn_prefix[SCOREPREFIX]; g.fqn_prefix[TROUBLEPREFIX] = g.fqn_prefix[SCOREPREFIX];
#endif #endif
check_recordfile(dir); check_recordfile(dir);
} }
sys/winnt/Makefile.msc
+5
View File
@@ -527,7 +527,12 @@ DATABASE = $(DAT)\data.base
# ctags options # ctags options
# #
#CTAGSCMD=ctags-orig.exe #CTAGSCMD=ctags-orig.exe
!IF "$(TRAVIS_BUILD_DIR)" != ""
CTAGSCMD=..\lib\ctags\ctags.exe
!ELSE
CTAGSCMD=..\..\..\ctags\ctags.exe CTAGSCMD=..\..\..\ctags\ctags.exe
!ENDIF
CTAGSOPT =--language-force=c --sort=no -D"Bitfield(x,n)=unsigned x : n" --excmd=pattern CTAGSOPT =--language-force=c --sort=no -D"Bitfield(x,n)=unsigned x : n" --excmd=pattern
# #
# ctags wants unix-style pathnames # ctags wants unix-style pathnames
win/Qt4/qt4stat.cpp
+2 -2
View File
@@ -431,7 +431,7 @@ void NetHackQtStatusWindow::updateStats()
if (u.mtimedone) { if (u.mtimedone) {
buf = nh_capitalize_words(mons[u.umonnum].mname); buf = nh_capitalize_words(mons[u.umonnum].mname);
} else { } else {
buf = rank_of(u.ulevel, pl_character[0], ::flags.female); buf = rank_of(u.ulevel, g.pl_character[0], ::flags.female);
} }
QString buf2; QString buf2;
buf2.sprintf("%s the %s", g.plname, buf.toLatin1().constData()); buf2.sprintf("%s the %s", g.plname, buf.toLatin1().constData());
@@ -441,7 +441,7 @@ void NetHackQtStatusWindow::updateStats()
if (describe_level(buf3)) { if (describe_level(buf3)) {
dlevel.setLabel(buf3,true); dlevel.setLabel(buf3,true);
} else { } else {
buf.sprintf("%s, level ", dungeons[u.uz.dnum].dname); buf.sprintf("%s, level ", g.dungeons[u.uz.dnum].dname);
dlevel.setLabel(buf,(long)::depth(&u.uz)); dlevel.setLabel(buf,(long)::depth(&u.uz));
} }
win/win32/vs2017/travisci.sh
+10 -2
View File
@@ -24,9 +24,17 @@ export LIB=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER
export LIB=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/VC/Tools/MSVC/$MSVER/lib/x86:$LIB export LIB=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/VC/Tools/MSVC/$MSVER/lib/x86:$LIB
export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/ucrt/x86:$LIB export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/ucrt/x86:$LIB
export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/um/x86:$LIB export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/um/x86:$LIB
git clone --depth 1 https://github.com/wmcbrine/PDCurses.git ../pdcurses mkdir -p lib
cd lib
git clone --depth 1 https://github.com/wmcbrine/PDCurses.git pdcurses
git clone --depth 1 https://github.com/universal-ctags/ctags.git ctags
curl -R -O http://www.lua.org/ftp/lua-5.3.5.tar.gz
tar zxf lua-5.3.5.tar.gz
cd ctags
nmake -f mk_mvc.mak
cd ../../
export ADD_CURSES=Y export ADD_CURSES=Y
export PDCURSES_TOP=../../pdcurses export PDCURSES_TOP=../lib/pdcurses
export export
cd src cd src
cp ../sys/winnt/Makefile.msc ./Makefile cp ../sys/winnt/Makefile.msc ./Makefile