Commit Graph

12805 Commits

Author SHA1 Message Date
nhmall
ccf9bb5fe2 updated Files 2022-02-04 10:43:43 -05:00
nhw_cron
47751ed6cb This is cron-daily v1-Feb-3-2022. 000files updated: Files 2022-02-04 10:32:32 -05:00
nhmall
471df587ab take 2 on src/.gitattributes 2022-02-04 09:41:30 -05:00
nhmall
c9e9b7a02a Revert "revert today's src/.gitattributes changes"
This reverts commit 5204eef9c0.
2022-02-04 09:40:31 -05:00
nhmall
ec350281c6 Revert "This is cron-daily v1-Jan-26-2022. 000files updated: Files"
This reverts commit 6d513efc1e.
2022-02-04 09:39:23 -05:00
Pasi Kallinen
8f7f598050 Fix mention_walls distinguishing unseen walls from solid stone
Bumping into an unseen wall reported "a wall" instead of "solid stone",
even though you could not know it was a wall when looking at it.

Use the same method when looking at glyphs on the map instead of
the map location type.

Fixes #318
2022-02-04 14:02:18 +02:00
nhmall
5204eef9c0 revert today's src/.gitattributes changes
For now. They appear to have broken some automation.
2022-02-03 12:31:21 -05:00
nhmall
01e820fa37 yet even more src/.gitattributes (final?) 2022-02-03 11:26:49 -05:00
nhmall
4dbc3566cf even more src/.gitattributes 2022-02-03 11:24:07 -05:00
nhmall
4f55c938d3 more src/.gitattributes 2022-02-03 11:22:29 -05:00
nhmall
d66e375f70 update src/.gitattributes for cron-job purposes 2022-02-03 11:19:54 -05:00
nhw_cron
6d513efc1e This is cron-daily v1-Jan-26-2022. 000files updated: Files 2022-02-03 09:01:30 -05:00
PatR
fffa9d58b7 rubber hose attacks
Give similar feedback for attacking with a rubber hose as for bullwhip:
the wielder "lashes" rather than "swings".
2022-02-03 04:42:19 -08:00
PatR
8a722ea949 Qt: add tool tips to to extended command selector
For the grid of extended commands used to pick one after typing "#",
show a command's description if the mouse hovers over its button.
For once something with Qt was actually easy.
2022-02-03 04:17:30 -08:00
PatR
62f89bf0c4 Files update 2022-02-03 03:29:14 -08:00
PatR
87bcd2ee50 update .gitignore
Ignore the new timestamp files src/moc.qt5 and src/moc.qt6.  They
probably ought to be renamed Qt*.moc-t but I haven't done that.

Also put back vis_tab.* in case someone checks out 3.6 and builds
that, then checks out 3.7 without doing 'make spotless' first.
2022-02-03 00:27:43 -08:00
nhmall
bc752a8f9d remove some duplicated code in monst.c 2022-02-02 21:26:01 -05:00
nhmall
c26bae521b static keyword on prototype, but function missing it
error 28 in line 4090 of "invent.c": redeclaration of var <adjust_ok> with new storage-class
error 28 in line 4100 of "invent.c": redeclaration of var <adjust_gold_ok> with new storage-class
error 28 in line 610 of "mdlib.c": redeclaration of var <count_and_validate_winopts> with new storage-class
error 28 in line 3846 of "options.c": redeclaration of var <pfxfn_cond_> with new storage-class
error 28 in line 3886 of "options.c": redeclaration of var <pfxfn_font> with new storage-class
error 28 in line 5307 of "options.c": redeclaration of var <determine_ambiguities> with new storage-class
error 28 in line 5343 of "options.c": redeclaration of var <length_without_val> with new storage-class
error 28 in line 6853 of "options.c": redeclaration of var <illegal_menu_cmd_key> with new storage-class
error 28 in line 7708 of "options.c": redeclaration of var <count_apes> with new storage-class
error 28 in line 2686 of "pickup.c": redeclaration of var <stash_ok> with new storage-class
error 28 in line 1008 of "read.c": redeclaration of var <can_center_cloud> with new storage-class
error 28 in line 31 of "rnd.c": redeclaration of var <whichrng> with new storage-class
2022-02-02 15:33:49 -05:00
PatR
afe36abdac fixes entry for pull request #665 - mplayer chat
From entrez:  Have fake players respond to #chat via verbalize() rather
than pline() since those responses are spoken.

Closes #665
2022-02-02 11:58:12 -08:00
Michael Meyer
79b3a624e4 Use verbalize for player monster speech
Attempting to chat with a player monster would inspire a witty retort,
but it was presented without quotation marks and so differed from other
types of monster speech.
2022-02-02 11:55:38 -08:00
nhmall
8ce4874152 remove unintentional repeat code in outdated file 2022-02-02 10:25:40 -05:00
PatR
9aea7b587c fix #K3455 - rocks vs xorns
Implement the suggestion that falling rock traps and rolling boulder
traps be harmless to xorns.  I've extended that to all missiles made
of stone (rocks, gems, boulders, a handful of other things that will
only matter if poly'd hero throws in '<' direction or is hit by stuff
scattered by an explosion).

I excluded ghosts because they would become even harder to kill and
the missile handling would need extra checks to test for blessed objs.
2022-02-02 05:26:03 -08:00
nhw_cron
2b70492474 This is cron-daily v1-Jan-26-2022. 000files updated: Files 2022-02-01 17:30:48 -05:00
nhmall
ba6688b40e follow-up to tilemap.c change 2022-02-01 17:18:44 -05:00
nhmall
3a4302773d two minor core changes for hypothetical Amiga cross port
The tilemap change provides three variables that used to be
uppercase compile macros in the past, and Amiga (and other ports?) used
them.

The other change just uncomments the header file include.
2022-02-01 17:11:35 -05:00
nhmall
83dcb5772b Merge branch 'amiga' into NetHack-3.7 2022-02-01 17:01:40 -05:00
PatR
bc6ca2b821 Qt 5 vs 6 'moc'
This is an attempt to address the issue of switching from Qt 5 to
Qt 6 or vice versa on Unix without running 'make spotless'.  Various
*.h files (but not all of them) in win/Qt/ are run through a program
called 'moc' to create new files *.moc that are included by *.cpp.
The problem is that the constructed files use the same names for Qt
5 or 6 but their contents apparently aren't compatible.  This adds
rules (specific to GNU make) that use a pair of timestamp files to
track which version of moc made src/*.moc and to destroy them when
switching Qt versions in order to force their re-creation.

As it stands, a hints file which includes hints/include/compiler.370
is now required in order to build the Qt interface with the Unix
Makefiles.  There's no change for platforms that don't use those and
I've no idea whether something comparable could be done for macOS
Xcode IDE.

The first time make is run with WANT_WIN_QT=1 after this is in place,
all the .moc files will be rebuilt and the subset of .cpp files which
include them will be recompiled.  After that, the .moc files will be
rebuilt as needed--and only as needed--just like any other constructed
files.
2022-02-01 13:50:12 -08:00
nhmall
bb01c6378a last known Amiga cross-compile -> outdated
Place the last known Amiga cross-compile effort into the outdated folder
tree.

This shell script was meant to be run from the top of the NetHack tree:
    outdated/sys/unix/cross-amiga.sh
It attempts two things:
1. obtain the source-code for the Amiga cross compiler and build it
   from scratch. Warning: it pulls a number of the required packages
   from the internet and installs them. (Linux was tested, but the macOS
   usage never was).
2. move the outdated hints file and hints include files for Amiga
   into the live tree for someone attempting to resurrect an Amiga port.
   It doesn't tinker with any of the files needed for the NetHack-3.7
   work-in-progess for other platforms.

Once the shell script completes those things, the cross-compile build
steps would be:
  i) cd sys/unix ; sh setup.sh hints/cross-amiga ; cd ../..
 ii) make CROSS_TO_AMIGA=1 all
iii) make CROSS_TO_AMIGA=1 package
2022-02-01 16:43:39 -05:00
nhmall
c75e5d99d2 syntax in prototype 2022-02-01 13:03:41 -05:00
PatR
0e6456c9f4 tty_raw_print_bold() again
Redo the tty handling for raw_print_bold() intended to keep it working
after exit_nhwindows().  Don't assign static addresses to nh_HI and
nh_HE in case the routine to free dynamic termcap data somehow gets
called again.
2022-01-31 18:31:34 -08:00
PatR
532cddbd35 topten's so (standout) handling
This fixes the broken code that was using a boolean as an integer.
I didn't try to track down when it changed or what it looked like
before the change.  The intended effect is fairly straightforward;
just padding a bold line with spaces.  I've no idea why someone
deciced that that was useful though.

It also fixes something I broke six years ago:  tty_exit_nhwindows()
releases the termcap data needed for turning bold on and off, so
raw_print_bold() used by topten() stopped working on tty then.

Not fixed:  the code in really_done() for dealing with topten() vs
the 'toptenwin' option really ought to be redone.
2022-01-31 18:20:34 -08:00
nhmall
ae11c6e25d some warnings with clang version 13.0.0-9
---------------------
win/curses/cursstat.c:

../win/curses/cursstat.c:301:9: warning: variable 'height' set but not used [-Wunused-but-set-variable]
        height, width, w, xtra, clen, x, y, t, ex, ey,
        ^
1 warning generated.

---------------------
win/Qt/qt_menu.cpp:

../win/Qt/qt_menu.cpp:1123:9: warning: variable 'h' set but not used [-Wunused-but-set-variable]
    int h=0;
        ^
1 warning generated.

---------------------
/win/Qt/qt_yndlg.cpp:

../win/Qt/qt_yndlg.cpp:170:6: warning: variable 'x' set but not used [-Wunused-but-set-variable]
        int x=margin, y=extra+margin;
            ^
../win/Qt/qt_yndlg.cpp:170:16: warning: variable 'y' set but not used [-Wunused-but-set-variable]
        int x=margin, y=extra+margin;
                      ^
2 warnings generated.

Commenting out the x and y references, then leads to the following additional warnings,
so comment those out too:

../win/Qt/qt_yndlg.cpp:167:12: warning: unused variable 'margin' [-Wunused-variable]
        const int margin=8;
                  ^
../win/Qt/qt_yndlg.cpp:168:12: warning: unused variable 'gutter' [-Wunused-variable]
        const int gutter=8;
                  ^
../win/Qt/qt_yndlg.cpp:169:12: warning: unused variable 'extra' [-Wunused-variable]
        const int extra=fontMetrics().height(); // Extra for group
                  ^
3 warnings generated.

---------------------
2022-01-31 15:11:05 -05:00
Pasi Kallinen
ac3c005615 Fix fall depth from Castle to the Valley 2022-01-31 20:31:26 +02:00
Pasi Kallinen
2cad4ecec2 Covetous monsters will teleport to downstairs or upstairs
I accidentally swapped the covetous monsters teleport to stairs to heal
but instead of changing it back like it was, now make those monsters
teleport to either upstairs or downstairs - some of them will go up,
others go down.
2022-01-31 19:52:33 +02:00
Pasi Kallinen
218c0d4a3b Stinking clouds block line of sight
... you will also get a message when a seen stinking cloud
or the one surrounding the hero dissipates.

Original feature comes from Fourk, but this version (with some
minor changes) comes from xnethack by copperwater <aosdict@gmail.com>
2022-01-31 19:00:19 +02:00
PatR
260e015067 comment bit 2022-01-30 13:26:49 -08:00
nhmall
e86b926e54 more CI mingw tinkering
The default tar in the path withing the CI environment is not
the bsdtar variation of tar that comes with Windows (the one
which will extract zip files as well as tar files).

Try using powershell instead for the extraction instead.
2022-01-30 14:27:44 -05:00
nhmall
87d58c1c83 more ming32 build in CI 2022-01-30 08:58:49 -05:00
nhmall
1caf9821d2 fake mail follow-up tidbit 2022-01-29 23:33:58 -05:00
nhw_cron
70daee80e5 This is cron-daily v1-Jan-26-2022. 000files updated: Files 2022-01-29 23:26:59 -05:00
nhmall
087f3993f7 yet more fixes*.* rename 2022-01-29 22:57:22 -05:00
nhmall
0150692a94 rework the fake mail readmail() routine
Remove the dynamic memory allocation.
2022-01-29 22:32:40 -05:00
nhmall
b1b2c67d09 ensure MSYSTEM matches mingw tools used in CI 2022-01-29 20:41:49 -05:00
nhmall
988e241021 back out one of the pr624 changes
This one caused a build failure on a cross-compile.
2022-01-29 20:32:30 -05:00
nhw_cron
0d1f3de027 This is cron-daily v1-Jan-26-2022. 000files updated: Files 2022-01-29 18:29:53 -05:00
nhmall
bfb2a29f7a update .gitattributes for two windows folders 2022-01-29 18:16:07 -05:00
PatR
d0b69efc10 more fixes*.* rename
nethack 3.0, nethack 2.2, and hack 1.0 did not use a three component
version numbering scheme so their corresponding fixes files shouldn't
do so either.  Change those from fixesX-Y-0.txt to fixesX-Y--.txt.
2022-01-29 15:00:49 -08:00
nhw_cron
eb8f7999fa This is cron-daily v1-Jan-26-2022. 000files updated: Files 2022-01-29 17:53:37 -05:00
nhmall
fd792509da build doc updates and windows Makefile updates 2022-01-29 17:29:51 -05:00
nhkeni
1647125f89 rationalize extensions in doc directory
rename text files to have .txt extension, etc
    update references to changed filenames
2022-01-29 16:28:06 -05:00