]> granicus.if.org Git - nethack/log
nethack
4 years agoRevert "Fix align type mixup wth align mask"
nhmall [Sat, 6 Feb 2021 19:54:54 +0000 (14:54 -0500)]
Revert "Fix align type mixup wth align mask"

This reverts commit 2f4f7d22d3531c8c07253543b9d8f81637f9356c
for now while the matter is investigated further.

Also closes #459

4 years agoLua: set and get config options
Pasi Kallinen [Sat, 6 Feb 2021 16:57:41 +0000 (18:57 +0200)]
Lua: set and get config options

Still needs more work, especially the error handling.

4 years agoWindows sys/winnt/Makefile.msc update
nhmall [Sat, 6 Feb 2021 00:53:05 +0000 (19:53 -0500)]
Windows sys/winnt/Makefile.msc update

4 years agowasm cross-compile bit
nhmall [Sat, 6 Feb 2021 00:16:49 +0000 (19:16 -0500)]
wasm cross-compile bit

4 years agoadd -Wdeprecated-copy if clang and clang >= 9
nhmall [Fri, 5 Feb 2021 21:28:09 +0000 (16:28 -0500)]
add -Wdeprecated-copy if clang and clang >= 9

4 years agotypo fix
nhmall [Fri, 5 Feb 2021 15:03:18 +0000 (10:03 -0500)]
typo fix

4 years agosync some macOS hints changes to linux hints
nhmall [Fri, 5 Feb 2021 14:51:07 +0000 (09:51 -0500)]
sync some macOS hints changes to linux hints

4 years agoseparate the C compiler flags and C++ compiler flags where needed
nhmall [Fri, 5 Feb 2021 14:45:03 +0000 (09:45 -0500)]
separate the C compiler flags and C++ compiler flags where needed

4 years agopotential fix for the macOS issue encountered
nhmall [Fri, 5 Feb 2021 14:38:35 +0000 (09:38 -0500)]
potential fix for the macOS issue encountered

Some build flags were unintentionally overlooked in a previous change

4 years agoroll back a Makefile.src change due to macOS issue afterwards
nhmall [Fri, 5 Feb 2021 12:43:51 +0000 (07:43 -0500)]
roll back a Makefile.src change due to macOS issue afterwards

Requires further investigation

4 years agoFix BIND segfault
Pasi Kallinen [Fri, 5 Feb 2021 09:14:11 +0000 (11:14 +0200)]
Fix BIND segfault

Recent commit that added terminator entry to default_menu_cmd_info
caused a segfault when trying to BIND keys.

4 years agocurses: honor menu_next_page/&c option settings
PatR [Fri, 5 Feb 2021 09:04:48 +0000 (01:04 -0800)]
curses: honor menu_next_page/&c option settings

tty and X11 honor the menu_xxx options.  Qt currently doesn't
support menu manipulation by keyboard.  curses does support that
but was only handling the default menu keys.

4 years agomore cross-compile warning bits
nhmall [Fri, 5 Feb 2021 00:42:07 +0000 (19:42 -0500)]
more cross-compile warning bits

maximize warnings for NetHack sources
minimize warnings for Lua and pdcurses which we won't be changing

4 years agoanother old-style-definition
nhmall [Fri, 5 Feb 2021 00:40:38 +0000 (19:40 -0500)]
another old-style-definition

4 years agomore msdos cross-compile pdcurses warning suppression
nhmall [Thu, 4 Feb 2021 23:53:18 +0000 (18:53 -0500)]
more msdos cross-compile pdcurses warning suppression

4 years agowarnings in cross-compile of pdcurses are not desired
nhmall [Thu, 4 Feb 2021 23:41:07 +0000 (18:41 -0500)]
warnings in cross-compile of pdcurses are not desired

4 years agoprogress detail in the CI log file is too verbose
nhmall [Thu, 4 Feb 2021 23:04:11 +0000 (18:04 -0500)]
progress detail in the CI log file is too verbose

4 years agoDisable warning 4774 for lua source files.
Bart House [Thu, 4 Feb 2021 19:28:41 +0000 (11:28 -0800)]
Disable warning 4774 for lua source files.

4 years agofollow-up on the util/recover.c change earlier
nhmall [Thu, 4 Feb 2021 17:50:53 +0000 (12:50 -0500)]
follow-up on the util/recover.c change earlier

It failed in the CI

4 years agoRevert "follow-up on the util/recover.c change earlier"
nhmall [Thu, 4 Feb 2021 17:48:51 +0000 (12:48 -0500)]
Revert "follow-up on the util/recover.c change earlier"

This reverts commit 54e984c70c72575e1095bdc4cf5b94e71a71761a.

4 years agofollow-up on the util/recover.c change earlier
nhmall [Thu, 4 Feb 2021 17:45:28 +0000 (12:45 -0500)]
follow-up on the util/recover.c change earlier

It failed in the CI

4 years agoset but not used warning in util/recover.c
nhmall [Thu, 4 Feb 2021 12:40:55 +0000 (07:40 -0500)]
set but not used warning in util/recover.c

../util/recover.c:416:9: warning: variable 'bsize' set but not used [-Wunused-but-set-variable]
  416 |     int bsize;
      |         ^~~~~

4 years agosome options tidying
PatR [Thu, 4 Feb 2021 09:35:58 +0000 (01:35 -0800)]
some options tidying

Somehow several arrays of compound option values ended up in
between defining menu_cmd_t and using menu_cmd_t.  Reorder them.

Also, add a terminator to the list of menu commands so that it
could potentially be used manipulated from other source files
that don't have access to the array size.

4 years agoanother duplicate entry in Xcode project file
nhmall [Thu, 4 Feb 2021 03:04:15 +0000 (22:04 -0500)]
another duplicate entry in Xcode project file

4 years agoremove a duplicate entry in Xcode project file
nhmall [Thu, 4 Feb 2021 03:03:04 +0000 (22:03 -0500)]
remove a duplicate entry in Xcode project file

4 years agoadd missing lua files to Xcode build
nhmall [Thu, 4 Feb 2021 02:52:42 +0000 (21:52 -0500)]
add missing lua files to Xcode build

4 years agoCouple of Xcode setup documenation bits
PatR [Thu, 4 Feb 2021 01:10:49 +0000 (17:10 -0800)]
Couple of Xcode setup documenation bits

4 years agoprevent lua crash upon init failure
PatR [Thu, 4 Feb 2021 01:09:35 +0000 (17:09 -0800)]
prevent lua crash upon init failure

panic() instead, so not much help to the player.

4 years agoQt close-window handling
PatR [Wed, 3 Feb 2021 21:42:17 +0000 (13:42 -0800)]
Qt close-window handling

Handle the unused variable 'ok' differently.

4 years agoQt follow-up bit
nhmall [Wed, 3 Feb 2021 20:36:00 +0000 (15:36 -0500)]
Qt follow-up bit

4 years agounused-but-set-variable warning in qt_main.cpp
nhmall [Wed, 3 Feb 2021 20:31:57 +0000 (15:31 -0500)]
unused-but-set-variable warning in qt_main.cpp

../win/Qt/qt_main.cpp: In member function ‘virtual void nethack_qt_::NetHackQtMainWindow::closeEvent(QCloseEvent*)’:
../win/Qt/qt_main.cpp:1377:9: warning: variable ‘ok’ set but not used [-Wunused-but-set-variable]
 1377 |     int ok = 0;
      |         ^~

4 years agoQt setChecked() takes a boolean argument
nhmall [Wed, 3 Feb 2021 20:19:49 +0000 (15:19 -0500)]
Qt setChecked() takes a boolean argument

4 years agoFix spelling error in Samurai quest
Patric Mueller [Wed, 3 Feb 2021 19:31:01 +0000 (20:31 +0100)]
Fix spelling error in Samurai quest

4 years agoensure build with old linux-qt5 hints
nhmall [Wed, 3 Feb 2021 18:46:13 +0000 (13:46 -0500)]
ensure build with old linux-qt5 hints

4 years agoremove debugging statement from warnings.h
nhmall [Wed, 3 Feb 2021 18:25:50 +0000 (13:25 -0500)]
remove debugging statement from warnings.h

4 years agoclear a number of Qt build warnings on linux related to compiler flags
nhmall [Wed, 3 Feb 2021 18:18:43 +0000 (13:18 -0500)]
clear a number of Qt build warnings on linux related to compiler flags

option ‘-Wimplicit’ is valid for C/ObjC but not for C++
option ‘-Wimplicit-function-declaration’ is valid for C/ObjC but not for C++
option ‘-Wimplicit-int’ is valid for C/ObjC but not for C++
option ‘-Wmissing-prototypes’ is valid for C/ObjC but not for C++
option ‘-Wmissing-parameter-type’ is valid for C/ObjC but not for C++
option ‘-Wold-style-definition’ is valid for C/ObjC but not for C++
option ‘-Wstrict-prototypes’ is valid for C/ObjC but not for C++

4 years agovariable set but not used warning in qt_yndlg.cpp
nhmall [Wed, 3 Feb 2021 17:56:55 +0000 (12:56 -0500)]
variable set but not used warning in qt_yndlg.cpp

../win/Qt/qt_yndlg.cpp: In member function ‘char nethack_qt_::NetHackQtYnDialog::Exec()’:
../win/Qt/qt_yndlg.cpp:80:9: warning: variable ‘ch_per_line’ set but not used [-Wunused-but-set-variable]
   80 |     int ch_per_line=6;
      |         ^~~~~~~~~~~

4 years agoprevent a warning about a multi-line comment in qt_svsel.cpp
nhmall [Wed, 3 Feb 2021 17:51:26 +0000 (12:51 -0500)]
prevent a warning about a multi-line comment in qt_svsel.cpp

4 years agoQt c++ function name shadow warnings
nhmall [Wed, 3 Feb 2021 15:55:07 +0000 (10:55 -0500)]
Qt c++ function name shadow warnings

We have a struct called mkroom and a function called mkroom()
so c++ complains about the mkroom() function hiding the
initializer for the struct.

Similarly, we have a struct called attack and a function
called attack().

There may be a more elegant way of eliminating those two
warnings, but renaming mkroom() to do_mkroom() and
attack() to do_attack() was straightforward enough.

4 years agowording fix
nhmall [Wed, 3 Feb 2021 14:42:59 +0000 (09:42 -0500)]
wording fix

4 years agoextend the Qt clang fix pertaining to shadowing of global variables to g++
nhmall [Wed, 3 Feb 2021 14:22:57 +0000 (09:22 -0500)]
extend the Qt clang fix pertaining to shadowing of global variables to g++

4 years agoWindows format string bits
nhmall [Wed, 3 Feb 2021 02:53:13 +0000 (21:53 -0500)]
Windows format string bits

4 years agoMerge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into...
keni [Wed, 3 Feb 2021 01:46:54 +0000 (20:46 -0500)]
Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7

4 years agosrc/end.c: improve backtrace text spacing (see #K3259)
keni [Wed, 3 Feb 2021 01:45:45 +0000 (20:45 -0500)]
src/end.c: improve backtrace text spacing (see #K3259)

4 years agomore macOS whitelisting
nhmall [Wed, 3 Feb 2021 01:11:43 +0000 (20:11 -0500)]
more macOS whitelisting

X11, Qt, and util

also ensure the functional warnings.h macro definitions are used
with c++ clang compiler

4 years agowhitelist some macOS clang format-nonliteral warnings
nhmall [Wed, 3 Feb 2021 00:50:07 +0000 (19:50 -0500)]
whitelist some macOS clang format-nonliteral warnings

4 years agoenable -Wformat-nonliteral for linux and equivalent for windows compilers
nhmall [Wed, 3 Feb 2021 00:03:12 +0000 (19:03 -0500)]
enable -Wformat-nonliteral for linux and equivalent for windows compilers

Whitelist all the verified existing triggers:
makedefs.c: In function ‘name_file’
attrib.c: one compiler balks at a ? b : c for fmtstring
cmd.c: In function ‘extcmd_via_menu’
cmd.c: In function ‘wiz_levltyp_legend’
do.c: In function ‘goto_level’
do_name.c: In function ‘coord_desc’
dungeon.c: In function ‘overview_stats’
eat.c:  one compiler balks at a ? b : c for fmtstring
end.c:  one compiler balks at a ? b : c for fmtstring
engrave.c: In function ‘engr_stats’
hack:c one compiler balks at a ? b : c for fmtstring
hacklib.c: one compiler balks at a ? b : c for fmtstring
insight.c: one compiler balks at a ? b : c for fmtstring
invent.c: In function ‘let_to_name’
light.c: In function ‘light_stats’
mhitm.c: In function ‘missmm’
options.c: In function ‘handler_symset’
options.c: In function ‘basic_menu_colors’
options.c: In function ‘optfn_o_autopickup_exceptions’
options.c: In function ‘optfn_o_menu_colors’
options.c: In function ‘optfn_o_message_types’
options.c: In function ‘optfn_o_status_cond’
options.c: In function ‘optfn_o_status_hilites’
options.c: In function ‘doset’
options.c: In function ‘doset_add_menu’
options.c: In function ‘show_menu_controls’
options.c: In function ‘handle_add_list_remove’
pager.c: In function ‘do_supplemental_info’
pager.c: In function ‘dohelp’
region.c: In function ‘region_stats’
rumors.c: sscanf usage
sounds.c: In function ‘domonnoise’
spell.c: In function ‘dospellmenu’
timeout.c: In function ‘timer_stats’
topten.c: In function ‘outentry’, fscanf, sscanf, fprintf usage
windows.c: In function ‘genl_status_update’
zap.c: one compiler balks at a ? b : c for fmtstring
win/curses/cursstat.c: In function ‘curses_status_update’
win/tty/wintty.c: In function ‘tty_status_update’
win/win32/mswproc.c: In function ‘mswin_status_update’

4 years agoadd format string arg to Sprintf in hack.c
nhmall [Tue, 2 Feb 2021 22:20:41 +0000 (17:20 -0500)]
add format string arg to Sprintf in hack.c

4 years agowarning fix - missing format string in botl.c
nhmall [Tue, 2 Feb 2021 21:06:25 +0000 (16:06 -0500)]
warning fix - missing format string in botl.c

4 years agoresolve a warning in sounds.c
nhmall [Tue, 2 Feb 2021 01:02:12 +0000 (20:02 -0500)]
resolve a warning in sounds.c

sounds.c: In function ‘add_sound_mapping’:
sounds.c:1381:33: warning: ‘sprintf’ may write a terminating nul past the end of the destination [-Wformat-overflow=]
 1381 |         Sprintf(filespec, "%s/%s", sounddir, filename);
      |                                 ^
In file included from ../include/config.h:631,
                 from ../include/hack.h:10,
                 from sounds.c:5:
../include/global.h:274:24: note: ‘sprintf’ output 2 or more bytes (assuming 257) into a destination of size 256
  274 | #define Sprintf (void) sprintf
sounds.c:1381:9: note: in expansion of macro ‘Sprintf’
 1381 |         Sprintf(filespec, "%s/%s", sounddir, filename);
      |         ^~~~~~~

4 years agoclear some more format-overflow warnings
nhmall [Mon, 1 Feb 2021 21:36:17 +0000 (16:36 -0500)]
clear some more format-overflow warnings

clear some -Wformat-overflow warnings being experienced with
i586-pc-msdosdjgpp-gcc (GCC) 10.2.0 cross-compiler

--
Warnings log:

botl.c: In function 'status_hilite_menu_add':
botl.c:3661:38: warning: ' or ' directive writing 4 bytes into a region of size between 1 and 80 [-Wformat-overflow=]
 3661 |                     Sprintf(obuf, "%s or %s",
      |                                      ^~~~
In file included from ../include/config.h:631,
                 from ../include/hack.h:10,
                 from botl.c:6:
../include/global.h:274:24: note: 'sprintf' output between 5 and 163 bytes into a destination of size 80
  274 | #define Sprintf (void) sprintf
botl.c:3661:21: note: in expansion of macro 'Sprintf'
 3661 |                     Sprintf(obuf, "%s or %s",
      |                     ^~~~~~~

do_name.c: In function 'getpos_menu':
do_name.c:594:37: warning: 'sprintf' may write a terminating nul past the end of the destination [-Wformat-overflow=]
  594 |             Sprintf(fullbuf, "%s%s%s", firstmatch,
      |                                     ^
In file included from ../include/config.h:631,
                 from ../include/hack.h:10,
                 from do_name.c:6:
../include/global.h:274:24: note: 'sprintf' output 1 or more bytes (assuming 257) into a destination of size 256
  274 | #define Sprintf (void) sprintf
do_name.c:594:13: note: in expansion of macro 'Sprintf'
  594 |             Sprintf(fullbuf, "%s%s%s", firstmatch,
      |             ^~~~~~~

dungeon.c: In function 'print_dungeon':
dungeon.c:2172:27: warning: '%s' directive writing up to 1407 bytes into a region of size 256 [-Wformat-overflow=]
 2172 |             Sprintf(buf, "%s: %s %d", dptr->dname, descr, dptr->depth_start);
      |                           ^~
In file included from ../include/config.h:631,
                 from ../include/hack.h:10,
                 from dungeon.c:6:
../include/global.h:274:24: note: 'sprintf' output between 10 and 1427 bytes into a destination of size 256
  274 | #define Sprintf (void) sprintf
dungeon.c:2172:13: note: in expansion of macro 'Sprintf'
 2172 |             Sprintf(buf, "%s: %s %d", dptr->dname, descr, dptr->depth_start);
      |             ^~~~~~~
dungeon.c:2169:27: warning: '%s' directive writing up to 1407 bytes into a region of size 256 [-Wformat-overflow=]
 2169 |             Sprintf(buf, "%s: %s %d to %d", dptr->dname, makeplural(descr),
      |                           ^~
dungeon.c:2169:26: note: directive argument in the range [-21474836472147483646]
 2169 |             Sprintf(buf, "%s: %s %d to %d", dptr->dname, makeplural(descr),
      |                          ^~~~~~~~~~~~~~~~~
In file included from ../include/config.h:631,
                 from ../include/hack.h:10,
                 from dungeon.c:6:
../include/global.h:274:24: note: 'sprintf' output 10 or more bytes (assuming 1427) into a destination of size 256
  274 | #define Sprintf (void) sprintf
dungeon.c:2169:13: note: in expansion of macro 'Sprintf'
 2169 |             Sprintf(buf, "%s: %s %d to %d", dptr->dname, makeplural(descr),
      |             ^~~~~~~
dungeon.c: In function 'print_mapseen':
dungeon.c:3185:33: warning: '%s' directive writing up to 255 bytes into a region of size 249 [-Wformat-overflow=]
 3185 |         Sprintf(outbuf, " (play %s to open or close drawbridge)", tmp);
      |                                 ^~                                ~~~
In file included from ../include/config.h:631,
                 from ../include/hack.h:10,
                 from dungeon.c:6:
../include/global.h:274:24: note: 'sprintf' output between 37 and 292 bytes into a destination of size 256
  274 | #define Sprintf (void) sprintf
dungeon.c:3185:9: note: in expansion of macro 'Sprintf'
 3185 |         Sprintf(outbuf, " (play %s to open or close drawbridge)", tmp);
      |         ^~~~~~~
dungeon.c:3350:35: warning: '%s' directive writing up to 255 bytes into a region of size 240 [-Wformat-overflow=]
 3350 |         Sprintf(buf, "%sThe castle%s.", PREFIX, tunesuffix(mptr, tmpbuf));
      |                                   ^~
In file included from ../include/config.h:631,
                 from ../include/hack.h:10,
                 from dungeon.c:6:
../include/global.h:274:24: note: 'sprintf' output between 18 and 273 bytes into a destination of size 256
  274 | #define Sprintf (void) sprintf
dungeon.c:3350:9: note: in expansion of macro 'Sprintf'
 3350 |         Sprintf(buf, "%sThe castle%s.", PREFIX, tunesuffix(mptr, tmpbuf));
      |         ^~~~~~~

explode.c:541:69: warning: '%s' directive writing up to 255 bytes into a region of size 236 [-Wformat-overflow=]
  541 |                     Sprintf(g.killer.name, "caught %sself in %s own %s", uhim(),
      |                                                                     ^~
In file included from ../include/config.h:631,
                 from ../include/hack.h:10,
                 from explode.c:5:
../include/global.h:274:24: note: 'sprintf' output 21 or more bytes (assuming 276) into a destination of size 256
  274 | #define Sprintf (void) sprintf
explode.c:541:21: note: in expansion of macro 'Sprintf'
  541 |                     Sprintf(g.killer.name, "caught %sself in %s own %s", uhim(),
      |                     ^~~~~~~

hacklib.c: In function 'yyyymmddhhmmss':
hacklib.c:1034:28: warning: '%02d' directive writing between 2 and 11 bytes into a region of size between 4 and 11 [-Wformat-overflow=]
 1034 |     Sprintf(datestr, "%04ld%02d%02d%02d%02d%02d", datenum, lt->tm_mon + 1,
      |                            ^~~~
hacklib.c:1034:22: note: directive argument in the range [-21474836472147483647]
 1034 |     Sprintf(datestr, "%04ld%02d%02d%02d%02d%02d", datenum, lt->tm_mon + 1,
      |                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../include/config.h:631,
                 from ../include/hack.h:10,
                 from hacklib.c:7:
../include/global.h:274:24: note: 'sprintf' output between 15 and 67 bytes into a destination of size 15
  274 | #define Sprintf (void) sprintf
hacklib.c:1034:5: note: in expansion of macro 'Sprintf'
 1034 |     Sprintf(datestr, "%04ld%02d%02d%02d%02d%02d", datenum, lt->tm_mon + 1,
      |     ^~~~~~~

4 years agoyet-another typo
nhmall [Mon, 1 Feb 2021 18:46:54 +0000 (13:46 -0500)]
yet-another typo

4 years agofollow-up bit
nhmall [Mon, 1 Feb 2021 18:44:09 +0000 (13:44 -0500)]
follow-up bit

missed macro and a typo

4 years agomore warnings.h - macOS issue
nhmall [Mon, 1 Feb 2021 18:37:04 +0000 (13:37 -0500)]
more warnings.h - macOS issue

It turns out that macOS barked when a POP was issued without
a prior PUSH, so since the DISABLE_WARNING_CONDEXPR_IS_CONSTANT
expanded to an empty macro on that platform.

Include a corresponding
RESTORE_WARNING_CONDEXPR_IS_CONSTANT macro for use with that
particular warning.

4 years agoThis is cron-daily v1-Jan-20-2020. files updated: Files
nhw_cron [Mon, 1 Feb 2021 18:24:08 +0000 (13:24 -0500)]
This is cron-daily v1-Jan-20-2020.  files updated: Files

4 years agovisual studio project update; also recover.c
nhmall [Mon, 1 Feb 2021 18:24:14 +0000 (13:24 -0500)]
visual studio project update; also recover.c

4 years agoWindows nmake build warnings during compiles of Lua sources
nhmall [Mon, 1 Feb 2021 18:03:32 +0000 (13:03 -0500)]
Windows nmake build warnings during compiles of Lua sources

4 years agosuppress a particular warning for an individual function; useful for non-gcc
nhmall [Mon, 1 Feb 2021 17:54:19 +0000 (12:54 -0500)]
suppress a particular warning for an individual function; useful for non-gcc

Microsoft and other non-GNU compilers don't recognize gcc tricks
like  /*NOTREACHED*/ to suppress individual warnings. clang recognizes most
of them because it tries to be gcc-compatible. Because of that, a lot of
potentially useful warnings have had to be completely suppressed in the
past in all source files when using the non-gcc compatible compilers.

Now that the code is C99, take advantage of a way to suppress warnings for
individual functions, a big step up from suppressing the warnings
altogether.

Unfortunately, it does require a bit of ugliness caused by the
insertion of some macros in a few spots, but I'm not aware of
a cleaner alternative that still allows warnings to be enabled
in general, while suppressing a warning for known white-listed
instances.

Prior to the warning-tiggering function, place whichever one of
the following is needed to suppress the warning being encountered:

DISABLE_WARNING_UNREACHABLE_CODE
DISABLE_WARNING_CONDEXPR_IS_CONSTANT

After the warning-triggering function, place this:

RESTORE_WARNINGS

Under the hood, the compiler-appropriate warning-disabling
mechanics involve the use of C99 _Pragma, which can be used
in macros.

For unrecognized or inappropriate compilers, or if
DISABLE_WARNING_PRAGMAS is defined, the macros expand
to nothing.

4 years agounify code for extracting an object from a monster's inventory PR #455
nhmall [Mon, 1 Feb 2021 14:41:21 +0000 (09:41 -0500)]
unify code for extracting an object from a monster's inventory PR #455

Closes #455

4 years agoMerge branch 'copperwater-pr455-2' into NetHack-3.7
nhmall [Mon, 1 Feb 2021 14:40:11 +0000 (09:40 -0500)]
Merge branch 'copperwater-pr455-2' into NetHack-3.7

4 years agowording bit
nhmall [Mon, 1 Feb 2021 02:34:23 +0000 (21:34 -0500)]
wording bit

4 years agofixes37.0 catch up for macOS Xcode issue
nhmall [Mon, 1 Feb 2021 02:32:03 +0000 (21:32 -0500)]
fixes37.0 catch up for macOS Xcode issue

4 years agooutdated files in Xcode project
nhmall [Mon, 1 Feb 2021 02:18:48 +0000 (21:18 -0500)]
outdated files in Xcode project

4 years agoXcode project fix when NetHack source directory path contains spaces
nhmall [Mon, 1 Feb 2021 01:07:50 +0000 (20:07 -0500)]
Xcode project fix when NetHack source directory path contains spaces

Underlying shell scripts configued in the Xcode project were not
coded to accommodate spaces in the path

4 years agooutdated vs Unix 'make depend'
PatR [Sun, 31 Jan 2021 21:05:32 +0000 (13:05 -0800)]
outdated vs Unix 'make depend'

After the most recent round of moving old stuff to 'outdated',
src/windows.c contained two references to non-existent files.
That broke 'make depend'.  Updating it to turn those two into
comments seems risky because someone might add an include for
some new interface later in the file.  So comment them out in
the source instead.  Also, redo previous 'make depend' update
from about three weeks ago to do the same thing.

4 years agoThis is cron-daily v1-Jan-20-2020. files updated: Files
nhw_cron [Sun, 31 Jan 2021 14:24:07 +0000 (09:24 -0500)]
This is cron-daily v1-Jan-20-2020.  files updated: Files

4 years agoFDECL and NDECL
nhmall [Sun, 31 Jan 2021 19:15:08 +0000 (14:15 -0500)]
FDECL and NDECL

4 years agofollow-up bit for QSORTCALLBACK entries
nhmall [Sun, 31 Jan 2021 19:06:56 +0000 (14:06 -0500)]
follow-up bit for QSORTCALLBACK entries

4 years agoCFDECLSPEC -> QSORTCALLBACK
nhmall [Sun, 31 Jan 2021 18:58:19 +0000 (13:58 -0500)]
CFDECLSPEC -> QSORTCALLBACK

also remove one inappropriate use of CFDECLSPEC

4 years agofollow-up to remove some remnant wingem.h references
nhmall [Sun, 31 Jan 2021 18:44:15 +0000 (13:44 -0500)]
follow-up to remove some remnant wingem.h references

this should correct the broken mingw tty build

4 years agoFDECL, NDECL in outdated
nhmall [Sun, 31 Jan 2021 18:40:15 +0000 (13:40 -0500)]
FDECL, NDECL in outdated

4 years agoFDECL and NDECL in sys/vms
nhmall [Sun, 31 Jan 2021 17:49:22 +0000 (12:49 -0500)]
FDECL and NDECL in sys/vms

4 years agoremnant FDECL
nhmall [Sun, 31 Jan 2021 14:20:25 +0000 (09:20 -0500)]
remnant FDECL

4 years agorelocate some gem and Gnome files to outdated folder tree
nhmall [Sun, 31 Jan 2021 13:51:35 +0000 (08:51 -0500)]
relocate some gem and Gnome files to outdated folder tree

4 years agoremove Amiga cross-compile bits
nhmall [Sun, 31 Jan 2021 12:57:28 +0000 (07:57 -0500)]
remove Amiga cross-compile bits

4 years agoRemove awful kludges dealing with command counts.
Bart House [Sun, 31 Jan 2021 03:06:27 +0000 (19:06 -0800)]
Remove awful kludges dealing with command counts.

4 years agofix #K3257 - lichens' sticky attack holds hero
PatR [Sun, 31 Jan 2021 01:19:17 +0000 (17:19 -0800)]
fix #K3257 - lichens' sticky attack holds hero

in the air.  can_reach_floor() was changed relatively recently
to return False if hero was held by a monster.  It wasn't
necessarily because the monster was lifting him or her off the
floor though.  Restricted movement could produce same effect.

Change the new behavior to only happen when holder has used a
hug attack, so that being held by a fungus or mimic doesn't
prevent access to the floor.

This may need to be revisited because the idea that the hero's
arms have been pinned by a hugging monster contradicts the
ability to attack that monster.  However, it matches the long-
standing inability to attack any other adjacent monster in
that circumstance.

4 years agosqueaky board message grammar bit
PatR [Sun, 31 Jan 2021 00:42:36 +0000 (16:42 -0800)]
squeaky board message grammar bit

"You hear a [BCDG] note squeak in the distance" is ok, but
"you hear a [AEF] note squeak in the distance" isn't.

Squeaky board notes already had correct a/an handling but that
particular message explicitly suppressed it.

4 years agoMerge branch 'extract-from-minvent' of https://github.com/copperwater/NetHack into...
nhmall [Sat, 30 Jan 2021 20:24:07 +0000 (15:24 -0500)]
Merge branch 'extract-from-minvent' of https://github.com/copperwater/NetHack into copperwater-pr455-2

4 years agoanother doc/options.doc update
nhmall [Sat, 30 Jan 2021 17:28:23 +0000 (12:28 -0500)]
another doc/options.doc update

4 years agodoc/options.doc update
nhmall [Sat, 30 Jan 2021 17:18:49 +0000 (12:18 -0500)]
doc/options.doc update

4 years agoMove the other options to alphabetical order
Pasi Kallinen [Sat, 30 Jan 2021 17:07:58 +0000 (19:07 +0200)]
Move the other options to alphabetical order

4 years agoMove other options into the options array
Pasi Kallinen [Sat, 30 Jan 2021 16:02:48 +0000 (18:02 +0200)]
Move other options into the options array

4 years agoremove an old #pragma from sp_lev.c that isn't actually accomplishing anything
nhmall [Sat, 30 Jan 2021 16:25:27 +0000 (11:25 -0500)]
remove an old #pragma from sp_lev.c that isn't actually accomplishing anything

4 years agoDisable warning for LUA files in Visual Studio builds.
Bart House [Sat, 30 Jan 2021 04:49:37 +0000 (20:49 -0800)]
Disable warning for LUA files in Visual Studio builds.

4 years agoa couple of curses warnings on one compiler
nhmall [Sat, 30 Jan 2021 04:14:16 +0000 (23:14 -0500)]
a couple of curses warnings on one compiler

4 years agoFixing azure pipeline build to use correct project.
Bart House [Sat, 30 Jan 2021 00:56:05 +0000 (16:56 -0800)]
Fixing azure pipeline build to use correct project.

4 years agoUnify code for extracting an object from a monster's inventory
copperwater [Sun, 24 Jan 2021 21:39:33 +0000 (16:39 -0500)]
Unify code for extracting an object from a monster's inventory

The code for doing this (basically an obj_extract_self() call plus
handling if the object was worn or wielded) was duplicated all over, and
inconsistent - for instance, though all of them updated the monster's
misc_worn_check to indicate it was no longer wearing something in
whatever slot, only one call also set the bit that flags the monster to
consider putting on other gear afterwards.

Under a new function, extract_from_minvent, all this extra handling is
checked in one function, which can simply replace the obj_extract_self
call.

A few callers (such as stealing) have some common code *after* the
object is extracted and some other things happen such as message
printing, such as calling mselftouch if the object was worn
gloves. extract_from_minvent does not handle these cases.

4 years agoextcmdlist[] bit
PatR [Fri, 29 Jan 2021 20:33:20 +0000 (12:33 -0800)]
extcmdlist[] bit

4 years agoazure-pipelines overrode a recent gcc change in the cross-compile
nhmall [Fri, 29 Jan 2021 19:29:38 +0000 (14:29 -0500)]
azure-pipelines overrode a recent gcc change in the cross-compile

this makes it match, but doesn't fix the stray

4 years agoextcmdlist[] formatting
PatR [Fri, 29 Jan 2021 18:48:35 +0000 (10:48 -0800)]
extcmdlist[] formatting

Reformat the list of commands, making all of them take two lines
(except for a couple that need more) even if they fit on one.

Put "#wizmgender" into alphabetical order.  I don't think we need
it anymore, but if we keep the functionality then it should be
demoted from a command to a wizard mode boolean option.

Also wrap a handful of lines wider than the formatting threshold.

4 years agodeal with some win/win32 warnings
nhmall [Fri, 29 Jan 2021 18:00:00 +0000 (13:00 -0500)]
deal with some win/win32 warnings

win/win32/mhdlg.c(137)   : warning C4456: declaration of 'wbuf' hides
                           previous local declaration
win/win32/mhdlg.c(62)    : note: see declaration of 'wbuf'
win/win32/mhdlg.c(875)   : warning C4189: 'gender': local variable is
                           initialized but not referenced
win/win32/mhdlg.c(874)   : warning C4189: 'race': local variable is
                           initialized but not referenced
win/win32/mhdlg.c(876)   : warning C4189: 'alignment': local variable is
                           initialized but not referenced
win/win32/mhdlg.c(873)   : warning C4189: 'role': local variable is
                           initialized but not referenced
win/win32/mhinput.h(24)  : warning C4201: nonstandard extension used:
                           nameless struct/union
win/win32/mhmsg.h(70)    : warning C4200: nonstandard extension used:
                           zero-sized array in struct/union
win/win32/mhinput.h(24)  : warning C4201: nonstandard extension used:
                           nameless struct/union
win/win32/mhinput.h(24)  : warning C4201: nonstandard extension used:
                           nameless struct/union
win/win32/mhmsg.h(70)    : warning C4200: nonstandard extension used:
                           zero-sized array in struct/union
win/win32/mhmsg.h(70)    : warning C4200: nonstandard extension used:
                           zero-sized array in struct/union
win/win32/mhmenu.c(62)   : warning C4201: nonstandard extension used:
                           nameless struct/union
win/win32/mhmenu.c(1082) : warning C4456: declaration of 'monitorScale'
                           hides previous local declaration
win/win32/mhmenu.c(995)  : note: see declaration of 'monitorScale'
win/win32/mhmenu.c(1142) : warning C4456: declaration of 'wbuf' hides
                           previous local declaration
win/win32/mhmenu.c(986)  : note: see declaration of 'wbuf'
win/win32/mhmenu.c(1082) : warning C4189: 'monitorScale': local variable
                           is initialized but not referenced
win/win32/mhmsg.h(70)    : warning C4200: nonstandard extension used:
                           zero-sized array in struct/union
win/win32/mhmsgwnd.c(700): warning C4701: potentially uninitialized
                           local variable 'size' used
win/win32/mhmsg.h(70)    : warning C4200: nonstandard extension used:
                           zero-sized array in struct/union
win/win32/mhmsg.h(70)    : warning C4200: nonstandard extension used:
                           zero-sized array in struct/union
win/win32/mhsplash.c(158): warning C4189: 'verstrsize': local variable
                           is initialized but not referenced
win/win32/mhmsg.h(70)    : warning C4200: nonstandard extension used:
                           zero-sized array in struct/union
win/win32/mhstatus.c(353): warning C4057: 'function':
                           'const unsigned char *' differs in indirection
                           to slightly different base types from 'const char *'
win/win32/mhmsg.h(70)    : warning C4200: nonstandard extension used:
                           zero-sized array in struct/union
win/win32/mhmsg.h(70)    : warning C4200: nonstandard extension used:
                           zero-sized array in struct/union
win/win32/NetHackW.c(181): warning C4456: declaration of 'buf' hides
                           previous local declaration
win/win32/NetHackW.c(90) : note: see declaration of 'buf'
win/win32/NetHackW.c(189): warning C4456: declaration of 'buf' hides
                           previous local declaration
win/win32/NetHackW.c(90) : note: see declaration of 'buf'

4 years agoAdd missing fields in shown_stats[] in winstat.c
Dean Luick [Fri, 29 Jan 2021 16:19:27 +0000 (10:19 -0600)]
Add missing fields in shown_stats[] in winstat.c

This eliminates a compiler initializer warning.

4 years agoAdd missing fields in extcmdlist[] in cmd.c
Dean Luick [Fri, 29 Jan 2021 15:58:16 +0000 (09:58 -0600)]
Add missing fields in extcmdlist[] in cmd.c

This eliminates a compiler initializer warning.

4 years agoFix align type mixup wth align mask
Dean Luick [Sun, 17 Jan 2021 20:25:08 +0000 (14:25 -0600)]
Fix align type mixup wth align mask

Fix two cases of missed conversion of an alignment to an align mask.

Change induced_align()'s return type to unsigned int since it returns
an align mask (unsigned), not an align type (signed).

4 years agoUpdate code style for ANSI function prototypes
Dean Luick [Fri, 29 Jan 2021 15:01:15 +0000 (09:01 -0600)]
Update code style for ANSI function prototypes

4 years agoFix X11 warnings
Dean Luick [Mon, 18 Jan 2021 00:17:13 +0000 (18:17 -0600)]
Fix X11 warnings

4 years agoFix set but not used warnings
Dean Luick [Fri, 29 Jan 2021 03:09:28 +0000 (21:09 -0600)]
Fix set but not used warnings

4 years agofix class discovery for fully discovered class
PatR [Fri, 29 Jan 2021 01:10:18 +0000 (17:10 -0800)]
fix class discovery for fully discovered class

This was caused by a post-3.6 change I made when adding sorting
capability to '`' (and to '\' but that wasn't affected).  Cited
case was lack of "water" when all potions had been discovered.
Some other classes (but not all) were vulnerable too.

4 years agofix #K3255 - "death wand"
PatR [Fri, 29 Jan 2021 01:00:13 +0000 (17:00 -0800)]
fix #K3255 - "death wand"

Prevent a wish request of "death wand" (as alternate spelling
for "wand of death") from matching "Death" monster and yielding
a random wand.

"death finger" and "death finger spellbook" produce a "spellbook
of finger of death" even without a similar fix.