nhmall
f4c1e84bdd
ignore windows link workfiles
2020-06-07 08:49:27 -04:00
nhmall
2c83e2e7e1
recognize visual studio 16.6 (released spring 2020)
2020-06-03 13:40:09 -04:00
nhmall
157d54ca27
Cross-compiling doc update
2020-05-31 12:41:36 -04:00
nhmall
0fed5a06db
Cross-compiling, msdos Makefile
2020-05-30 08:41:20 -04:00
nhmall
3d3fa958c6
add an indicator of thonged portion to aklys tile
2020-05-26 11:16:54 -04:00
nhmall
149592eb29
Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7
2020-05-24 16:28:43 -04:00
nhmall
009c969a00
slash'em had a different palette defined
2020-05-24 16:24:58 -04:00
nhmall
1d7ee022e6
remove outdated header files from Xcode project
2020-05-23 14:08:45 -04:00
nhmall
305ad3c58e
remove outdated Xcode references
2020-05-23 14:00:34 -04:00
nhmall
e726bfe98a
Xcode bit
2020-05-23 13:52:17 -04:00
nhmall
36d2da1b80
travis naming: platform-build-compiler-other
2020-05-20 11:34:24 -04:00
nhmall
a8d813b696
.travis.yml bit
2020-05-18 23:28:23 -04:00
nhmall
696aaf8b8d
remove added hints file
...
append the -fno-common to the existing Makefile
2020-05-18 23:24:29 -04:00
nhmall
98ba1bdf20
travis update - have a build with and without -fno-common
2020-05-18 22:49:05 -04:00
nhmall
ee41403af2
add -fno-common build to travis
2020-05-18 22:39:49 -04:00
nhmall
c1cd4eb0ae
Windows Makefile.msc update for more recent VS 2019
2020-05-15 17:49:50 -04:00
nhmall
a6d84209bf
msdos Makefile bit
...
still untested
2020-05-10 12:16:37 -04:00
nhmall
285fc69da0
Makefile updates for windows, msdos
...
The msdos Makefile changes are untested.
2020-05-10 12:11:17 -04:00
nhmall
d36a127574
.gitattributes for outdated folder
2020-05-10 11:52:00 -04:00
nhmall
0068315131
.gitattributes for outdated/sys/msdos
2020-05-10 11:50:03 -04:00
nhmall
390a531f16
relocate the real mode msdos code to outdated/sys/msdos
2020-05-10 11:46:07 -04:00
nhmall
0422696e67
move currently unmaintained code to outdated subfolder
...
rename {sys => outdated/sys}/amiga/.gitattributes (100%)
rename {sys => outdated/sys}/amiga/Build.ami (100%)
rename {sys => outdated/sys}/amiga/Install.ami (100%)
rename {sys => outdated/sys}/amiga/Makefile.agc (100%)
rename {sys => outdated/sys}/amiga/Makefile.ami (100%)
rename {sys => outdated/sys}/amiga/NetHack.cnf (100%)
rename {sys => outdated/sys}/amiga/amidos.c (100%)
rename {sys => outdated/sys}/amiga/amidos.p (100%)
rename {sys => outdated/sys}/amiga/amifont.uu (100%)
rename {sys => outdated/sys}/amiga/amifont8.uu (100%)
rename {sys => outdated/sys}/amiga/amigst.c (100%)
rename {sys => outdated/sys}/amiga/amii.hlp (100%)
rename {sys => outdated/sys}/amiga/amimenu.c (100%)
rename {sys => outdated/sys}/amiga/amirip.c (100%)
rename {sys => outdated/sys}/amiga/amistack.c (100%)
rename {sys => outdated/sys}/amiga/amitty.c (100%)
rename {sys => outdated/sys}/amiga/amiwind.c (100%)
rename {sys => outdated/sys}/amiga/amiwind.p (100%)
rename {sys => outdated/sys}/amiga/clipwin.c (100%)
rename {sys => outdated/sys}/amiga/colorwin.c (100%)
rename {sys => outdated/sys}/amiga/grave16.xpm (100%)
rename {sys => outdated/sys}/amiga/ifchange (100%)
rename {sys => outdated/sys}/amiga/mkdmake (100%)
rename {sys => outdated/sys}/amiga/txt2iff.c (100%)
rename {sys => outdated/sys}/amiga/winami.c (100%)
rename {sys => outdated/sys}/amiga/winami.p (100%)
rename {sys => outdated/sys}/amiga/winchar.c (100%)
rename {sys => outdated/sys}/amiga/windefs.h (100%)
rename {sys => outdated/sys}/amiga/winext.h (100%)
rename {sys => outdated/sys}/amiga/winfuncs.c (100%)
rename {sys => outdated/sys}/amiga/winkey.c (100%)
rename {sys => outdated/sys}/amiga/winmenu.c (100%)
rename {sys => outdated/sys}/amiga/winproto.h (100%)
rename {sys => outdated/sys}/amiga/winreq.c (100%)
rename {sys => outdated/sys}/amiga/winstr.c (100%)
rename {sys => outdated/sys}/amiga/xpm2iff.c (100%)
rename {sys => outdated/sys}/atari/.gitattributes (100%)
rename {sys => outdated/sys}/atari/Install.tos (100%)
rename {sys => outdated/sys}/atari/atarifnt.uue (100%)
rename {sys => outdated/sys}/atari/nethack.mnu (100%)
rename {sys => outdated/sys}/atari/setup.g (100%)
rename {sys => outdated/sys}/atari/tos.c (100%)
rename {sys => outdated/sys}/atari/unx2atar.sed (100%)
rename {sys => outdated/sys}/be/.gitattributes (100%)
rename {sys => outdated/sys}/be/README (100%)
rename {sys => outdated/sys}/be/bemain.c (100%)
rename {sys => outdated/sys}/mac/.gitattributes (100%)
rename {sys => outdated/sys}/mac/Files.r (100%)
rename {sys => outdated/sys}/mac/Install.mw (100%)
rename {sys => outdated/sys}/mac/MacHelp (100%)
rename {sys => outdated/sys}/mac/NHDeflts (100%)
rename {sys => outdated/sys}/mac/NHrsrc.hqx (100%)
rename {sys => outdated/sys}/mac/NHsound.hqx (100%)
rename {sys => outdated/sys}/mac/News (100%)
rename {sys => outdated/sys}/mac/README (100%)
rename {sys => outdated/sys}/mac/carbon.plist (100%)
rename {sys => outdated/sys}/mac/dprintf.c (100%)
rename {sys => outdated/sys}/mac/maccurs.c (100%)
rename {sys => outdated/sys}/mac/macerrs.c (100%)
rename {sys => outdated/sys}/mac/macfile.c (100%)
rename {sys => outdated/sys}/mac/machelp.hqx (100%)
rename {sys => outdated/sys}/mac/macmain.c (100%)
rename {sys => outdated/sys}/mac/macmenu.c (100%)
rename {sys => outdated/sys}/mac/mactopl.c (100%)
rename {sys => outdated/sys}/mac/mactty.c (100%)
rename {sys => outdated/sys}/mac/macunix.c (100%)
rename {sys => outdated/sys}/mac/macwin.c (100%)
rename {sys => outdated/sys}/mac/mgetline.c (100%)
rename {sys => outdated/sys}/mac/mmodal.c (100%)
rename {sys => outdated/sys}/mac/mrecover.c (100%)
rename {sys => outdated/sys}/mac/mrecover.hqx (100%)
rename {sys => outdated/sys}/mac/mttymain.c (100%)
rename {sys => outdated/sys}/os2/.gitattributes (100%)
rename {sys => outdated/sys}/os2/Install.os2 (100%)
rename {sys => outdated/sys}/os2/Makefile.os2 (100%)
rename {sys => outdated/sys}/os2/nhpmico.uu (100%)
rename {sys => outdated/sys}/os2/os2.c (100%)
rename {sys => outdated/sys}/wince/.gitattributes (100%)
rename {sys => outdated/sys}/wince/Install.ce (100%)
rename {sys => outdated/sys}/wince/bootstrp.mak (100%)
rename {sys => outdated/sys}/wince/ceinc/.gitattributes (100%)
rename {sys => outdated/sys}/wince/ceinc/assert.h (100%)
rename {sys => outdated/sys}/wince/ceinc/errno.h (100%)
rename {sys => outdated/sys}/wince/ceinc/fcntl.h (100%)
rename {sys => outdated/sys}/wince/ceinc/sys/.gitattributes (100%)
rename {sys => outdated/sys}/wince/ceinc/sys/stat.h (100%)
rename {sys => outdated/sys}/wince/celib.c (100%)
rename {sys => outdated/sys}/wince/cesetup.bat (100%)
rename {sys => outdated/sys}/wince/cesound.c (100%)
rename {sys => outdated/sys}/wince/defaults.nh (100%)
rename {sys => outdated/sys}/wince/keypad.uu (100%)
rename {sys => outdated/sys}/wince/menubar.uu (100%)
rename {sys => outdated/sys}/wince/mhaskyn.c (100%)
rename {sys => outdated/sys}/wince/mhaskyn.h (100%)
rename {sys => outdated/sys}/wince/mhcmd.c (100%)
rename {sys => outdated/sys}/wince/mhcmd.h (100%)
rename {sys => outdated/sys}/wince/mhcolor.c (100%)
rename {sys => outdated/sys}/wince/mhcolor.h (100%)
rename {sys => outdated/sys}/wince/mhdlg.c (100%)
rename {sys => outdated/sys}/wince/mhdlg.h (100%)
rename {sys => outdated/sys}/wince/mhfont.c (100%)
rename {sys => outdated/sys}/wince/mhfont.h (100%)
rename {sys => outdated/sys}/wince/mhinput.c (100%)
rename {sys => outdated/sys}/wince/mhinput.h (100%)
rename {sys => outdated/sys}/wince/mhmain.c (100%)
rename {sys => outdated/sys}/wince/mhmain.h (100%)
rename {sys => outdated/sys}/wince/mhmap.c (100%)
rename {sys => outdated/sys}/wince/mhmap.h (100%)
rename {sys => outdated/sys}/wince/mhmenu.c (100%)
rename {sys => outdated/sys}/wince/mhmenu.h (100%)
rename {sys => outdated/sys}/wince/mhmsg.h (100%)
rename {sys => outdated/sys}/wince/mhmsgwnd.c (100%)
rename {sys => outdated/sys}/wince/mhmsgwnd.h (100%)
rename {sys => outdated/sys}/wince/mhrip.c (100%)
rename {sys => outdated/sys}/wince/mhrip.h (100%)
rename {sys => outdated/sys}/wince/mhstatus.c (100%)
rename {sys => outdated/sys}/wince/mhstatus.h (100%)
rename {sys => outdated/sys}/wince/mhtext.c (100%)
rename {sys => outdated/sys}/wince/mhtext.h (100%)
rename {sys => outdated/sys}/wince/mhtxtbuf.c (100%)
rename {sys => outdated/sys}/wince/mhtxtbuf.h (100%)
rename {sys => outdated/sys}/wince/mswproc.c (100%)
rename {sys => outdated/sys}/wince/newres.h (100%)
rename {sys => outdated/sys}/wince/nhico.uu (100%)
rename {sys => outdated/sys}/wince/resource.h (100%)
rename {sys => outdated/sys}/wince/winMS.h (100%)
rename {sys => outdated/sys}/wince/winhack.c (100%)
rename {sys => outdated/sys}/wince/winhack.rc (100%)
rename {sys => outdated/sys}/wince/winhcksp.rc (100%)
rename {sys => outdated/sys}/wince/winmain.c (100%)
rename {win => outdated/win}/Qt3/.gitattributes (100%)
rename {win => outdated/win}/Qt3/Info.plist (100%)
rename {win => outdated/win}/Qt3/Install.Qt (100%)
rename {win => outdated/win}/Qt3/knethack.lnk (100%)
rename {win => outdated/win}/Qt3/knh-mini.xpm (100%)
rename {win => outdated/win}/Qt3/knh.xpm (100%)
rename {win => outdated/win}/Qt3/qpe-nethack.control (100%)
rename {win => outdated/win}/Qt3/qt3_clust.cpp (100%)
rename {win => outdated/win}/Qt3/qt3_clust.h (100%)
rename {win => outdated/win}/Qt3/qt3_kde0.h (100%)
rename {win => outdated/win}/Qt3/qt3_win.cpp (100%)
rename {win => outdated/win}/Qt3/qt3_win.h (100%)
rename {win => outdated/win}/Qt3/qt3_xpms.h (100%)
rename {win => outdated/win}/Qt3/qt3tableview.cpp (100%)
rename {win => outdated/win}/Qt3/qt3tableview.h (100%)
rename {win => outdated/win}/Qt3/tileedit.cpp (100%)
rename {win => outdated/win}/Qt3/tileedit.h (100%)
rename {win => outdated/win}/gem/.gitattributes (100%)
rename {win => outdated/win}/gem/Install.gem (100%)
rename {win => outdated/win}/gem/bitmfile.c (100%)
rename {win => outdated/win}/gem/gem_rsc.uu (100%)
rename {win => outdated/win}/gem/gem_rso.uu (100%)
rename {win => outdated/win}/gem/gr_rect.c (100%)
rename {win => outdated/win}/gem/gr_rect.h (100%)
rename {win => outdated/win}/gem/load_img.c (100%)
rename {win => outdated/win}/gem/tile2img.c (100%)
rename {win => outdated/win}/gem/title.uu (100%)
rename {win => outdated/win}/gem/wingem.c (100%)
rename {win => outdated/win}/gem/wingem1.c (100%)
rename {win => outdated/win}/gem/xpm2img.c (100%)
rename {win => outdated/win}/gnome/.gitattributes (100%)
rename {win => outdated/win}/gnome/README (100%)
rename {win => outdated/win}/gnome/gn_xpms.h (100%)
rename {win => outdated/win}/gnome/gnaskstr.c (100%)
rename {win => outdated/win}/gnome/gnaskstr.h (100%)
rename {win => outdated/win}/gnome/gnbind.c (100%)
rename {win => outdated/win}/gnome/gnbind.h (100%)
rename {win => outdated/win}/gnome/gnglyph.c (100%)
rename {win => outdated/win}/gnome/gnglyph.h (100%)
rename {win => outdated/win}/gnome/gnmain.c (100%)
rename {win => outdated/win}/gnome/gnmain.h (100%)
rename {win => outdated/win}/gnome/gnmap.c (100%)
rename {win => outdated/win}/gnome/gnmap.h (100%)
rename {win => outdated/win}/gnome/gnmenu.c (100%)
rename {win => outdated/win}/gnome/gnmenu.h (100%)
rename {win => outdated/win}/gnome/gnmesg.c (100%)
rename {win => outdated/win}/gnome/gnmesg.h (100%)
rename {win => outdated/win}/gnome/gnomeprv.h (100%)
rename {win => outdated/win}/gnome/gnopts.c (100%)
rename {win => outdated/win}/gnome/gnopts.h (100%)
rename {win => outdated/win}/gnome/gnplayer.c (100%)
rename {win => outdated/win}/gnome/gnplayer.h (100%)
rename {win => outdated/win}/gnome/gnsignal.c (100%)
rename {win => outdated/win}/gnome/gnsignal.h (100%)
rename {win => outdated/win}/gnome/gnstatus.c (100%)
rename {win => outdated/win}/gnome/gnstatus.h (100%)
rename {win => outdated/win}/gnome/gntext.c (100%)
rename {win => outdated/win}/gnome/gntext.h (100%)
rename {win => outdated/win}/gnome/gnworn.c (100%)
rename {win => outdated/win}/gnome/gnworn.h (100%)
rename {win => outdated/win}/gnome/gnyesno.c (100%)
rename {win => outdated/win}/gnome/gnyesno.h (100%)
rename {win => outdated/win}/gnome/mapbg.xpm (100%)
2020-05-10 11:31:25 -04:00
nhmall
c6d09a58d6
move unmaintained files into outdated folder
...
If an old port is resurrected to work with current version code, its files
can be relocated to the appropriate sys or win folder as required.
In the meantime, the burden of upkeep can be avoided for the stuff in the
outdated folder for now.
2020-05-10 11:24:51 -04:00
nhmall
c2fa3c36d8
dependency bit
2020-05-09 18:19:56 -04:00
nhmall
26ac20503c
fixup build for platforms without curses after drawing.c split
...
An Undefined reference to decgraphics_mode_callback was possible
if built for tty only.
drawing.c had an #include "tcap.h" which is what actually defined
TERMLIB. It isn't needed in drawing.c anymore, but it is needed
in symbols.c, in order to get the define for TERMLIB so that
decgraphics_mode_callback variable gets defined.
The undefined reference was from win/tty/termcap.h in code that
was #ifdef TERMLIB, but win/tty/termcap.h has the #include "tcap.h"
2020-05-09 18:07:56 -04:00
nhmall
d564fa8ac7
extern.h obsolete bit
2020-05-06 17:03:06 -04:00
nhmall
7178d2c9e2
extern.h updates to reflect drawing.c split
2020-05-06 16:40:24 -04:00
nhmall
044b55a8ba
sys/winnt/Makefile.gcc updates for new file (mingw)
2020-05-06 16:24:03 -04:00
nhmall
aa3a859bef
remove obsolete global variable declaration
2020-05-06 12:44:12 -04:00
nhmall
c831522e94
Xcode fixes
2020-05-06 11:35:55 -04:00
nhmall
e06e042151
from cron-daily
2020-05-06 11:30:45 -04:00
nhmall
e2ccebb0cf
move some text strings from drawing.c over to the file that uses them
2020-05-06 11:15:25 -04:00
nhmall
cdf280628c
split symbols bits from drawing.c; new file src/symbols.c
2020-05-06 10:55:54 -04:00
nhmall
f1d7676bfb
more CROSSCOMPILE fixes
2020-05-05 14:04:29 -04:00
nhmall
28ae203ad7
directory correction bit in Cross-compiling doc
...
panic.c is in util
2020-05-04 09:16:33 -04:00
nhmall
e440e9569d
change is_safepet macro name
...
Leaving the word "pet" in the macro name, when it applied to non-pets
seemed too contradictory, even for NetHack.
2020-05-03 21:52:41 -04:00
nhmall
aa5eb5a355
yet another host-side crosscompile fix
...
The host build portion using sys/msdos/Makefile1.cross) was failing because it
was attempting to compile the generated tile.o which is using hack.h.
gcc -o../util/tilemap host_o/tilemap.o
A new ../src/tile.c has been created
gcc -c -O -I../include -I../sys/msdos -DDLB -DUSE_TILES -DCROSSCOMPILE -DCROSSCOMPILE_HOST -ohost_o/tile.o ../src/tile.c
In file included from ../include/hack.h:201:0,
from ../src/tile.c:3:
../include/dungeon.h:70:5: error: unknown type name ‘lua_State’
lua_State *themelua; /* themerms compiled lua */
^
../sys/msdos/Makefile1.cross:286: recipe for target 'host_o/tile.o' failed
make: *** [host_o/tile.o] Error 1
I don't think think the tile.o is required on the host build build portion,
so it is probably an error in the Makefile. Try removing it.
2020-05-03 21:22:55 -04:00
nhmall
e15b30e9c5
Revert "build fix for platforms that have no LUA awareness during makedefs compile"
...
This reverts commit eb704832a9 .
That fix was insufficient.
The addition of
lua_State *themelua;
to the dungeon struct in dungeon.h prevents the build of host-side utilities that
include "hack.h" via the CROSSCOMPILER_HOST. Unfortunately, it is no longer possible
to cross-compile NetHack 3.7. That includes the cross-compiled MSDOS build.
2020-05-02 17:17:40 -04:00
nhmall
eb704832a9
build fix for platforms that have no LUA awareness during makedefs compile
...
gcc -c -O -I../include -I../sys/msdos -DDLB -DUSE_TILES -DCROSSCOMPILE -DCROSSCOMPILE_HOST -ohost_o/makedefs.o ../util/makedefs.c
In file included from ../util/makedefs.c:18:0:
../include/dungeon.h:68:5: error: unknown type name ‘lua_State’
lua_State *themelua; /* themerms compiled lua */
^
2020-05-01 20:36:11 -04:00
nhmall
dfcccfcf54
x64 64 bit pointers, 32 bit longs
...
../src/sp_lev.c: In function 'flip_level':
../src/sp_lev.c:816:24: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
long ty = ((long) timer->arg.a_void) & 0xffff;
^
../src/sp_lev.c:817:25: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
long tx = (((long) timer->arg.a_void) >> 16) & 0xffff;
^
../src/sp_lev.c:823:33: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
timer->arg.a_void = (genericptr_t) ((tx << 16) | ty);
2020-04-29 15:58:55 -04:00
nhmall
d87675c94c
get rid of unused variable warnings in topten.c
2020-04-29 10:18:46 -04:00
nhmall
23428d0fcc
squadprob array had 5 elements but only 4 initialized
...
fixes #335
2020-04-21 14:32:14 -04:00
nhmall
d8a409c34f
windows build fix
...
src\cmd.c(505) : error C4703: potentially uninitialized local pointer variable 'efp' used
NMAKE : fatal error U1077
2020-04-19 13:40:20 -04:00
nhmall
d47792ca64
Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7
2020-04-11 17:55:09 -04:00
nhmall
b0237e6d3f
prototype for optfn_palette
2020-04-11 17:54:24 -04:00
nhmall
f4a83fc9de
typo fix in .travis.yml
2020-04-11 10:25:47 -04:00
nhmall
08852d25be
mingw build bit
2020-04-11 10:14:05 -04:00
nhmall
db7a3abce4
Xcode warning of possible uninitialized variables
2020-04-10 00:29:51 -04:00
nhmall
3bfb5a6c35
quiet windows x86 warnings
...
nhlua.c(628): warning C4244: 'function': conversion from 'lua_Integer' to 'int', possible loss of data
nhlua.c(644): warning C4244: 'function': conversion from 'lua_Integer' to 'int', possible loss of data
nhlua.c(646): warning C4244: 'function': conversion from 'lua_Integer' to 'int', possible loss of data
2020-04-01 12:58:36 -04:00
nhmall
8961331478
bit
2020-03-22 07:39:44 -04:00
nhmall
5c3670b1f0
msdos build fix
...
../include/optlist.h:510:62: error: macro "NHOPTC" requires 10 arguments, but only 9 given
"color mappings for internal screen routines")
^
../include/optlist.h:562:52: error: macro "NHOPTP" requires 10 arguments, but only 9 given
"prefix for old micro IBM_ options")
^
2020-03-13 10:48:17 -04:00
nhmall
ba534a337a
Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7
2020-03-07 14:36:24 -05:00
nhmall
97cf78d0e6
merge bit
2020-03-07 14:36:03 -05:00
nhmall
d2009bc8d0
Merge NetHack 3.6 updates into NetHack-3.7
2020-03-07 14:08:40 -05:00
nhmall
b069b2224a
update visual studio props file
2020-03-07 11:45:35 -05:00
nhmall
7363189b22
clear travis boolean prerelease flag as well
2020-03-07 11:38:42 -05:00
nhmall
a52ff4b946
update .travis.yml
2020-03-07 11:32:50 -05:00
nhmall
6c57144a0e
one more redundant entry
2020-03-06 12:01:59 -05:00
nhmall
d8b1d19137
remove redundant entries that are now in fixes36.6
2020-03-06 11:58:23 -05:00
nhmall
94f06d629a
merge bits
2020-03-06 11:30:39 -05:00
nhmall
2913983c64
amiga .gitattributes bit
2020-03-06 11:04:24 -05:00
nhmall
cc61ac61a4
README bit
2020-03-06 11:00:51 -05:00
nhmall
2af37f44d4
Merge March 2020 changes into NetHack 3.7
2020-03-06 10:59:50 -05:00
nhmall
e20024e42b
March 2020 updates
2020-03-06 10:31:51 -05:00
nhmall
998893ac32
fixes update
2020-03-04 16:01:50 -05:00
nhmall
abdd3254ae
updates for 3.6 March 2020
2020-03-04 10:41:57 -05:00
nhmall
1e5fd608bf
update to Install.nt
2020-03-04 10:31:48 -05:00
nhmall
7902bacf70
build fix for vs2019
...
src\nhlsel.c(604) : error C4703: potentially uninitialized local pointer variable 'mf' used
2020-03-03 18:34:27 -05:00
nhmall
ee2821e7e8
action after parse_role_opts() returns FALSE
...
The old parseoptions() would get a FALSE return from parse_role_opts() and
then exit FALSE.
The new parseoptions() was printing an error message due to the FALSE return
value, and then exiting FALSE.
Have it behave the original way following parse_role_opts().
2020-03-02 01:11:51 -05:00
nhmall
0f3719d15e
typos in doc/options.doc
2020-03-01 11:04:02 -05:00
nhmall
058fbc1cd5
more duplicate detect; also copy-and-paste for vt_tiledata entry left it enabled by default
2020-03-01 10:48:46 -05:00
nhmall
16e5b27054
Merge
2020-02-29 18:49:16 -05:00
nhmall
2f1be94bfa
since sole argument to set_duplicate_opt_detection was unused, eliminate it altogether
2020-02-29 18:47:34 -05:00
nhmall
c4b5d2f54b
some warnings
2020-02-29 18:36:03 -05:00
nhmall
5d310d815d
options follow-up: fix up duplicate_option_detection and !pet
2020-02-29 17:54:41 -05:00
nhmall
cca2bcaa84
minor flavor bit of the day
2020-02-29 13:57:31 -05:00
nhmall
74b7ca1ad9
update a parameter in some ancient platforms
2020-02-26 21:53:07 -05:00
nhmall
3c95cba526
fix build break when there's no #define for CLIPPING
2020-02-26 21:38:38 -05:00
nhmall
9f01b33d9f
fixes entry
...
This issue was present prior to the options overhaul; a fix
was embedded in the options overhaul code changes
2020-02-26 15:45:04 -05:00
nhmall
e05a6d411d
Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7
2020-02-26 15:36:53 -05:00
nhmall
21ae547dec
typo in fixes
2020-02-26 15:30:10 -05:00
nhmall
5f430f8105
fix warning observed on Mac OS X
2020-02-26 15:20:08 -05:00
nhmall
d609314d64
transpose error in comments bit
2020-02-26 15:03:58 -05:00
nhmall
1115402c14
Merge branch 'options-overhaul' into NetHack-3.7
2020-02-26 14:36:20 -05:00
nhmall
64e3cd72a4
fixes37.0 update for options overhaul
2020-02-26 14:32:07 -05:00
nhmall
96a559e392
fix the menu_* options which had valok set to No
2020-02-26 14:23:26 -05:00
nhmall
68fdc3bbcb
February 2020 options.c overhaul
...
combine boolean and compound options into a single allopt[] array for
processing in options.c.
move the definitions of the options into new include/optlist.h file which
uses a set of macros to define them appropriately.
during compile of options.c each option described in include/optlist.h:
1. automatically results in a function prototype for an optfn called
optfn_xxxx (xxxx is the option name).
2. automatically results in an opt_xxxx enum value for referencing
its index throughout options.c (xxxx is the option name).
3. is used to initialize an element of the allopt[] array at index
opt_xxxx (xxxx is the option name) based on the settings in the
NHOPTB, NHOPTC, NHOPTP macros. Those macros only live during the
compilation of include/optlist.h.
each optfn_xxxx() function can be called with a req id of: do_init, do_set,
get_val or do_handler.
req do_init is called from options_init, and if initialization or memory
allocation or other initialization for that particular option is needed,
it can be done in response to the init req.
req do_set is called from parseoptions() for each option it encounters
and the optfn_xxxx() function is expected to react and set the option
based on the string values that parseoptions() passes to it.
req get_val expects each optfn_xxxx() function to write the current
option value into the buffer it is passed.
req do_handler is called during doset() operations in response to player
selections most likely from the 'O' option-setting menu, but only if the
option is identified as having do_handler support in the allopts[]
'has_handler' boolean flag. Not every optfn_xxxx() does.
function special_handling() is eliminated. It's code has been redistributed
to individual handler functions for the option or purpose that they serve.
moved reglyph_darkroom() function from options.c to display.c
2020-02-26 00:24:37 -05:00
nhmall
1003a8142e
fix a couple of warnings seen on visual studio 2019
...
src/sp_lev.c(4278): warning C4113: 'int (__cdecl *)()' differs in parameter lists from 'int(__cdecl *)(int,int)'
src/sp_lev.c(5021): warning C4113: 'int (__cdecl *)()' differs in parameter lists from 'int (__cdecl *)(int,int)'
2020-02-25 22:56:50 -05:00
nhmall
a7c143c8f9
fix a pair of warnings received with visual studio
...
src/sp_lev.c(4278): warning C4113: 'int (__cdecl *)()' differs in parameter lists from 'int(__cdecl *)(int,int)'
src/sp_lev.c(5021): warning C4113: 'int (__cdecl *)()' differs in parameter lists from 'int (__cdecl *)(int,int)'
Add prototype prior to first reference
2020-02-25 21:37:10 -05:00
nhmall
86f5e73ef3
ensure condition menu always starts the same way even under "play again"
2020-02-20 20:36:37 -05:00
nhmall
3bc346868e
flag an unused parameter
2020-02-20 20:23:33 -05:00
nhmall
67df8dd784
add an entry for the start_menu change to fixes37.0
2020-02-20 20:19:49 -05:00
nhmall
9462b230c6
Merge branch 'menu-interface' into NetHack-3.7
2020-02-20 20:17:40 -05:00
nhmall
d81c096ce6
window port interface change - add mbehavior flags to start_menu()
...
Provide a way to communicate additional behaviors and/or appearances
desired from NetHack window port menus.
This is foundation work for changes to follow at a future date.
2020-02-20 20:12:51 -05:00
nhmall
8e6e4922f8
preserve menu sort between 'O' commands in same instance
...
Also, only execute the change settings loop when the
menu response was > 0
2020-02-20 16:56:05 -05:00
nhmall
d50c3577e9
some more status condition follow-up
...
- Don't display 'Held' when swallowed.
- Don't display 'Held' when the hero is doing the holding; add a condition display
entry "UHold" for that (the opt_in option is "holding")
- Allow resorting of the 'O' menu for status condition fields. Default is alphabetical, but you
can sort by condition field ranking now.
2020-02-20 01:22:27 -05:00
nhmall
f177675cbc
Guidebook.txt update from cron-NetHack-3.7
2020-02-17 14:39:24 -05:00
nhmall
73ffb61e7e
typo in .tex and replacement of obsolete OS reference
2020-02-17 13:39:04 -05:00
nhmall
f9c9c8262c
Guidebook.txt and Files from cron daily
2020-02-16 00:26:43 -05:00
nhmall
f37dd40110
Guidebook date bump and .txt sync
2020-02-15 13:24:48 -05:00