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

Merge branch 'NetHack-3.6'

Browse Source
This commit is contained in:
nhmall
2019-10-30 20:22:48 -04:00
parent 2eab66617d 7f867c098b
commit 61fe703331
6 changed files with 1057 additions and 974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
Files
View File

@@ -50,9 +50,9 @@ fixes30.pl08 fixes30.pl09 fixes30.pl10 fixes31.1 fixes31.2
fixes31.3 fixes32.0 fixes32.1 fixes32.2 fixes32.3
fixes33.0 fixes33.1 fixes34.0 fixes34.1 fixes34.2
fixes34.3 fixes35.0 fixes36.0 fixes36.1 fixes36.2
lev_comp.6 lev_comp.txt makedefs.6 makedefs.txt mn.7
mnh.7 nethack.6 nethack.txt recover.6 recover.txt
tmac.n tmac.nh window.doc
fixes36.3 lev_comp.6 lev_comp.txt makedefs.6 makedefs.txt
mn.7 mnh.7 nethack.6 nethack.txt recover.6
recover.txt tmac.n tmac.nh window.doc
include:
(files for GEM versions)
@@ -359,38 +359,102 @@ getline.c termcap.c topl.c wintty.c
win/win32:
(files for Windows versions - tested up to Windows 10)
NetHackW.exe.manifest dgnstuff-mingw32.mak dgnstuff.mak
levstuff-mingw32.mak levstuff.mak mhaskyn.c
mhaskyn.h mhdlg.c mhdlg.h
mhfont.c mhfont.h mhinput.c
mhinput.h mhmain.c mhmain.h
mhmap.c mhmap.h mhmenu.c
mhmenu.h mhmsg.h mhmsgwnd.c
mhmsgwnd.h mhrip.c mhrip.h
mhsplash.c mhsplash.h mhstatus.c
mhstatus.h mhtext.c mhtext.h
mnsel.uu mnselcnt.uu mnunsel.uu
mswproc.c nethack.rc nhresource.h
petmark.uu pilemark.uu record.uu
resource.h rip.uu splash.uu
tiles-mingw32.mak tiles.mak winMS.h
winhack.c winhack.rc
NetHackW.c NetHackW.exe.manifest NetHackW.rc
dgnstuff-mingw32.mak dgnstuff.mak levstuff-mingw32.mak
levstuff.mak mhaskyn.c mhaskyn.h
mhdlg.c mhdlg.h mhfont.c
mhfont.h mhinput.c mhinput.h
mhmain.c mhmain.h mhmap.c
mhmap.h mhmenu.c mhmenu.h
mhmsg.h mhmsgwnd.c mhmsgwnd.h
mhrip.c mhrip.h mhsplash.c
mhsplash.h mhstatus.c mhstatus.h
mhtext.c mhtext.h mnsel.uu
mnselcnt.uu mnunsel.uu mswproc.c
nethack.rc nhresource.h petmark.uu
pilemark.uu record.uu resource.h
rip.uu splash.uu tiles-mingw32.mak
tiles.mak winMS.h
win/win32/vs2017:
(files for Visual Studio 2017 Community Edition builds)
NetHack.sln NetHack.vcxproj NetHackW.vcxproj
PDCurses.vcxproj afterdgncomp.proj afterdlb.proj
afterlevcomp.proj aftermakedefs.proj afternethack.proj
afterrecover.proj aftertile2bmp.proj aftertilemap.proj
afteruudecode.proj build.bat common.props
config.props console.props default.props
default_dll.props default_lib.props dgncomp.vcxproj
dirs.props dlb.vcxproj dll.props
files.props levcomp.vcxproj makedefs.vcxproj
nh340key.def nh340key.vcxproj nhdefkey.def
nhdefkey.vcxproj nhraykey.def nhraykey.vcxproj
recover.vcxproj tile2bmp.vcxproj tilemap.vcxproj
tiles.vcxproj uudecode.vcxproj
NetHack.sln NetHack.vcxproj
NetHackPackage.appxmanifest NetHackPackage.wapproj
NetHackProperties.props NetHackW.vcxproj
PDCurses.vcxproj Package.StoreAssociation.xml
ScreenShot.PNG afterdgncomp.proj
afterdlb.proj afterlevcomp.proj
aftermakedefs.proj afternethack.proj
afterrecover.proj aftertile2bmp.proj
aftertilemap.proj afteruudecode.proj
build.bat common.props
config.props console.props
default.props default_dll.props
default_lib.props dgncomp.vcxproj
dirs.props dlb.vcxproj
dll.props files.props
levcomp.vcxproj makedefs.vcxproj
nh340key.def nh340key.vcxproj
nhdefkey.def nhdefkey.vcxproj
nhraykey.def nhraykey.vcxproj
recover.vcxproj tile2bmp.vcxproj
tilemap.vcxproj tiles.vcxproj
travisci.sh uudecode.vcxproj
win/win32/vs2017/Images:
(files for Visual Studio 2017 Community Edition builds)
BadgeLogo.scale-100.png
BadgeLogo.scale-125.png
BadgeLogo.scale-150.png
BadgeLogo.scale-200.png
BadgeLogo.scale-400.png
LargeTile.scale-100.png
LargeTile.scale-125.png
LargeTile.scale-150.png
LargeTile.scale-200.png
LargeTile.scale-400.png
LockScreenLogo.scale-200.png
SmallTile.scale-100.png
SmallTile.scale-125.png
SmallTile.scale-150.png
SmallTile.scale-200.png
SmallTile.scale-400.png
SplashScreen.scale-100.png
SplashScreen.scale-125.png
SplashScreen.scale-150.png
SplashScreen.scale-200.png
SplashScreen.scale-400.png
Square150x150Logo.scale-100.png
Square150x150Logo.scale-125.png
Square150x150Logo.scale-150.png
Square150x150Logo.scale-200.png
Square150x150Logo.scale-400.png
Square44x44Logo.altform-unplated_targetsize-16.png
Square44x44Logo.altform-unplated_targetsize-256.png
Square44x44Logo.altform-unplated_targetsize-32.png
Square44x44Logo.altform-unplated_targetsize-48.png
Square44x44Logo.scale-100.png
Square44x44Logo.scale-125.png
Square44x44Logo.scale-150.png
Square44x44Logo.scale-200.png
Square44x44Logo.scale-400.png
Square44x44Logo.targetsize-16.png
Square44x44Logo.targetsize-24.png
Square44x44Logo.targetsize-24_altform-unplated.png
Square44x44Logo.targetsize-256.png
Square44x44Logo.targetsize-32.png
Square44x44Logo.targetsize-48.png
StoreLogo.backup.png
StoreLogo.scale-100.png
StoreLogo.scale-125.png
StoreLogo.scale-150.png
StoreLogo.scale-200.png
StoreLogo.scale-400.png
Wide310x150Logo.scale-100.png
Wide310x150Logo.scale-125.png
Wide310x150Logo.scale-150.png
Wide310x150Logo.scale-200.png
Wide310x150Logo.scale-400.png
This is a list of files produced by auxiliary programs. They can all be
regenerated from the files in the distribution.

1872
doc/Guidebook.txt
View File

File diff suppressed because it is too large Load Diff

5
include/global.h
View File

@@ -70,9 +70,10 @@
* since otherwise comparisons with signed quantities are done incorrectly
*/
typedef schar xchar;
#if defined(__GNUC__) && defined(WIN32) && defined(__cplusplus)
#ifdef __MINGW32__
/* Resolve conflict with Qt 5 and MinGW-w32 */
typedef uchar boolean; /* 0 or 1 */
typedef unsigned char boolean; /* 0 or 1 */
#else
#ifndef SKIP_BOOLEAN
typedef xchar boolean; /* 0 or 1 */

3
src/engrave.c
View File

@@ -289,7 +289,8 @@ int cnt;
void
wipe_engr_at(x, y, cnt, magical)
xchar x, y, cnt, magical;
xchar x, y, cnt;
boolean magical;
{
register struct engr *ep = engr_at(x, y);

6
sys/winnt/Makefile.gcc
View File

@@ -510,9 +510,9 @@ endif
CFLAGSBASE = -c $(cflags) $(WINPINC) $(cdebug) $(CURSESDEF)
#LFLAGSBASEC = $(linkdebug)
#LFLAGSBASEG = $(linkdebug) -mwindows
conlibs = -lgdi32 -lwinmm $(BCRYPT)
guilibs = -lcomctl32 -lwinmm
baselibs = -lwinmm -lshell32 -lole32
conlibs = -lgdi32 $(baselibs) $(BCRYPT)
guilibs = -lcomctl32 $(baselibs)
ifeq "$(WANT_WIN_QT4)" "Y"
# Might be either Qt 4 or Qt 5
ifeq "$(HAVE_QT5)" "Y"

17
sys/winnt/windmain.c
View File

@@ -11,9 +11,26 @@
#include <stdlib.h>
#include <sys\stat.h>
#include <errno.h>
#ifndef __MINGW32__
#include <appmodel.h>
#endif
#include <ShlObj.h>
#ifdef __MINGW32__
extern LONG GetCurrentPackageFullName(UINT32 *packageFullNameLength,
PWSTR packageFullName);
extern HRESULT SHGetKnownFolderPath(REFKNOWNFOLDERID rfid,
DWORD dwFlags, HANDLE hToken, PWSTR *ppszPath);
#ifdef INITGUID
#define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) const GUID DECLSPEC_SELECTANY name = { l, w1, w2,{ b1, b2, b3, b4, b5, b6, b7, b8 } }
#else
#define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) const GUID name
#endif
DEFINE_KNOWN_FOLDER (FOLDERID_ProgramData, 0x62ab5d82, 0xfdc1, 0x4dc3, 0xa9, 0xdd, 0x07, 0x0d, 0x1d, 0x49, 0x5d, 0x97);
DEFINE_KNOWN_FOLDER (FOLDERID_LocalAppData, 0xf1b32785, 0x6fba, 0x4fcf, 0x9d, 0x55, 0x7b, 0x8e, 0x7f, 0x15, 0x70, 0x91);
DEFINE_KNOWN_FOLDER (FOLDERID_Profile, 0x5e6c858f, 0x0e22, 0x4760, 0x9a, 0xfe, 0xea, 0x33, 0x17, 0xb6, 0x71, 0x73);
#endif
#if 0
#include "wintty.h"
#endif