Commit Graph

1578 Commits

Author SHA1 Message Date
nhmall
cc5ecbcb56 Merge NetHack-3.6 2019-11-17 00:19:33 -05:00
nhmall
80b90f2b0f Merge branch 'NetHack-3.6' 2019-11-17 00:18:24 -05:00
nhmall
21e4595127 sysconf template for windows 2019-11-17 00:16:02 -05:00
nhmall
5f3398347c Merge branch 'NetHack-3.6' 2019-11-16 23:14:34 -05:00
nhmall
a364348098 add an mgflags parameter to mapglyph() to alter how it behaves internally
avoid a recent save-value,call,restore-value kludge by adding
an mgflags parameter to mapglyph() to control its behavior

 Changes to be committed:
	modified:   doc/window.doc
	modified:   include/extern.h
	modified:   include/hack.h
	modified:   src/detect.c
	modified:   src/mapglyph.c
	modified:   src/pager.c
	modified:   sys/amiga/winfuncs.c
	modified:   sys/wince/mhmap.c
	modified:   win/Qt/qt_win.cpp
	modified:   win/Qt4/qt4map.cpp
	modified:   win/X11/winmap.c
	modified:   win/curses/cursdial.c
	modified:   win/curses/cursinvt.c
	modified:   win/curses/cursmain.c
	modified:   win/gem/wingem.c
	modified:   win/tty/wintty.c
	modified:   win/win32/mhmap.c
	modified:   win/win32/mswproc.c
2019-11-16 22:49:36 -05:00
nhmall
18f6af1466 Merge branch 'NetHack-3.6' 2019-11-16 18:27:50 -05:00
PatR
2a07924063 rename S_player_override to S_hero_override 2019-11-16 14:31:57 -08:00
nhmall
f319a8ce3f Merge branch 'master' into NetHack-3.7 2019-11-15 13:24:31 -05:00
nhmall
f3cb37e7ca Merge branch 'NetHack-3.6' 2019-11-15 13:23:58 -05:00
PatR
304673dcab hints/macosx10.14 comment
A comment in macosx10.14 describing how to create a signed package
had the last sample command wrong.  Fix it now in case that part
carries over to hypothetical--but likely--new macosx10.15 hints.

Also, shorten a couple of wide comment lines in the same area.
2019-11-15 10:12:45 -08:00
nhmall
8bd6ef629a update post-Lua
add lib/ to .gitignore

add optional "make fetch-Lua" step to simplify prerequisite to "make all"
2019-11-15 11:12:00 -05:00
nhmall
b7d16efd76 Makefile.msc updates post-Lua integration 2019-11-15 09:51:04 -05:00
nhmall
d2128968fa Merge branch 'NetHack-3.7' into paxed-lua-v2-merged 2019-11-14 19:50:20 -05:00
nhmall
6c97b0f9a1 Merge branch 'NetHack-3.6' 2019-11-14 19:48:57 -05:00
nhmall
e0fbd52359 header issues so just remove them for now on msdos *.cross Makefiles 2019-11-14 19:18:49 -05:00
nhmall
61a8ad35f5 more minor msdos Makefile bits 2019-11-14 19:17:44 -05:00
nhmall
6ea483242e some msdos cross-compile additional notes and a clarification 2019-11-14 19:12:14 -05:00
nhmall
8e7888d631 introduce msdos build support for cross-compiling on other platforms 2019-11-14 14:10:56 -05:00
nhmall
9470138324 Merge branch 'NetHack-3.6' 2019-11-13 01:08:33 -05:00
nhmall
392ddb2fef updates to vmsbuild.com to include lua and new 3.7 files 2019-11-12 23:41:01 -05:00
nhmall
bc0d78138f some, but not all, vms issues fixed 2019-11-12 19:58:48 -05:00
nhmall
ec91626316 fix mingw Makefile.gcc for 3.7 and lua support 2019-11-12 12:42:42 -05:00
nhmall
2359a9820e prototype fix after Windows gcc complaint 2019-11-11 18:12:39 -05:00
nhmall
3bc26e6c65 Merge branch 'NetHack-3.7' into paxed-lua-v2-merged 2019-11-11 14:33:31 -05:00
nhmall
900a826e8e Merge branch 'NetHack-3.6' 2019-11-11 14:32:09 -05:00
nhmall
6dfbff9d4b --showpaths wasn't returning the paths if there was an error in a config file
Also,
Windows only: Introduces some environment variable substitution for paths
specified in a config file
2019-11-11 12:49:54 -05:00
nhmall
bc69fc65d2 Merge branch 'NetHack-3.6' into bart-test 2019-11-11 11:27:50 -05:00
nhmall
10411fbd39 Merge branch 'NetHack-3.7' into paxed-lua-v2-merged 2019-11-09 21:57:26 -05:00
nhmall
641eeeab49 Merge branch 'NetHack-3.6' 2019-11-09 21:50:18 -05:00
nhmall
fddffc2fa0 updates to reveal_paths 2019-11-09 21:20:46 -05:00
nhmall
632c2efdcd Merge branch 'NetHack-3.7' into paxed-lua-v2-merged 2019-11-09 12:25:43 -05:00
nhmall
afec87a766 Merge branch 'NetHack-3.6' 2019-11-09 12:24:10 -05:00
nhmall
c566c01f8d add command line option --showpaths
Add
	--showpaths
early option to show where NetHack is expecting to find certain files
without starting up a game. It exits afterwards.

Windows sample (for illustration only, locations may differ for you):
    Variable playground locations:
        [hackdir   ]="C:\Users\JohnDoe\NetHack\3.6\"
        [leveldir  ]="C:\Users\JohnDoe\AppData\Local\NetHack\3.6\"
        [savedir   ]="C:\Users\JohnDoe\AppData\Local\NetHack\3.6\"
        [bonesdir  ]="C:\ProgramData\NetHack\3.6\"
        [datadir   ]="C:\personal\nhdev\363\test\binary\"
        [scoredir  ]="C:\ProgramData\NetHack\3.6\"
        [lockdir   ]="C:\ProgramData\NetHack\3.6\"
        [sysconfdir]="C:\ProgramData\NetHack\3.6\"
        [configdir ]="C:\Users\JohnDoe\NetHack\3.6\"
        [troubledir]="C:\Users\JohnDoe\NetHack\3.6\"
    Your system configuration file (in sysconfdir):
        "C:\Users\JohnDoe\NetHack\3.6\sysconf"
    Your system symbols file (in sysconfdir):
        "C:\Users\JohnDoe\NetHack\3.6\symbols"
    Your personal configuration file (in configdir):
        "C:\Users\JohnDoe\NetHack\3.6\.nethackrc"

Linux (for illustration only, locations may differ for you):
    Your system configuration file:
        "/home/johndoe/nh/install/games/lib/nethackdir/sysconf"
    Your system symbols file:
        "/home/johndoe/nh/install/games/lib/nethackdir/symbols"
    Your personal configuration file:
        "/home/johndoe/.nethackrc"
2019-11-09 10:57:25 -05:00
nhmall
2709a395be more makefile.msc 2019-11-08 18:01:53 -05:00
nhmall
71be3f8163 some Makefile.msc macro shenanigans 2019-11-08 17:49:07 -05:00
nhmall
9b0090aad9 Merge branch 'NetHack-3.7' into paxed-lua-v2-merged 2019-11-08 12:28:36 -05:00
nhmall
50d04bbd61 Merge branch 'NetHack-3.6' 2019-11-07 23:10:47 -05:00
nhmall
0c5b1674ef restore use of wildcards in sys/vms/install.com (untested) 2019-11-07 19:39:11 -05:00
PatR
2058ad10f9 missing data file on vms
vms's install.com was processing bigrm-%.lev (which corresponds to
bigrm-?.lev on unix) so missed two-digit bigrm-10.lev.
2019-11-07 16:21:52 -08:00
nhmall
40c8c6894b move vms lua support bits (untested of course) 2019-11-07 18:34:51 -05:00
nhmall
5264589994 comment out unneeded levcomp and dgncomp bits on vms 3.7 build 2019-11-07 17:47:26 -05:00
nhmall
4f654b630e src and include are down 1 level in src subfolder of lua tree 2019-11-07 17:30:55 -05:00
nhmall
8d4ccf5111 attempt to add the additional include directory to vms build 2019-11-07 17:28:57 -05:00
nhmall
39972beb0d cut-and-paste error bit 2019-11-07 17:21:23 -05:00
nhmall
f2d8ff49d5 add vms lua build bits 2019-11-07 17:17:17 -05:00
Pasi Kallinen
32f2fdb135 Remove leftover level compiler header 2019-11-07 19:40:41 +02:00
nhmall
293082079c suppress a warning in one lua file build 2019-11-07 12:06:40 -05:00
Pasi Kallinen
468ba1071d Remove the hints file change for extra warnings 2019-11-07 18:45:42 +02:00
Pasi Kallinen
6dca5e0a49 Fix couple warnings
Alloc failure is already handled.
2019-11-07 18:13:48 +02:00
nhmall
fecf930ac0 Makefile updates 2019-11-06 19:47:37 -05:00