Commit Graph

12839 Commits

Author SHA1 Message Date
nhmall
8aa29f8a08 adjust Makefile.mingw32 for 3.7 date and time stamping
NetHack 3.7 stores timestamp information, as well as github
commit hashs information if available, internally by compiling
date.c. It is important to ensure that date.c is always
recompiled after any other NetHack source files are compiled.
2022-02-05 21:34:55 -05:00
nhmall
05f3e6efd3 update the dependencies in sys/windows/Makefile.msc
As usual for the visual studio nmake Makefile.msc, steal the generated
dependencies from the tail of sys/unix/Makefile.src, and adjust the text
to suit the Windows build.
2022-02-05 20:12:10 -05:00
nhw_cron
3d3febee71 This is cron-daily v1-Feb-3-2022. 000files updated: Files 2022-02-05 15:35:29 -05:00
nhmall
99cdb8bfb5 a slight code-reordering in flush_screen()
despite flush_screen() being called with a True argument signifying that
the cursor was to be left on the hero, sometimes the cursor wasn't. That
was confirmed through some debug tracing and discussion. The subsequent
bot() and timebot() calls could leave the cursor in the status area (on
tty at least), and that was particularly observable during some runmodes.

Get the bot() and timebot() calls out of the way ahead of the cursor
placement call to the window port.
2022-02-05 14:12:18 -05:00
nhmall
ea2e61aba0 Merge branch 'pr668' into NetHack-3.7 2022-02-05 09:33:01 -05:00
nhmall
211b908681 Merge branch 'remove-redundant' of https://github.com/argrath/NetHack into pr668 2022-02-05 08:57:16 -05:00
PatR
f9f209bb49 Qt 5 vs Qt 6 revisited plus 'make depend' update
Rename the recently added timestamp file used to throw away old qt
'moc' files from moc.qt5 or moc.qt6 to Qt5.h-t or Qt6.h-t and use
that to also throw away old qt_*.o when switching from Qt 5 to Qt 6
or vice versa.  Temporarily the old names remain in Makefile.src's
'clean' target and in src/.gitignore but those will be removed soon.

Update 'make depend' to add the timestamp file to qt_*.o dependencies.
Have it generate rules to build qt_*.moc from ../win/Qt/qt_*.h instead
of using a template rule in hints/include/compiler.370.  So building
the Qt interface doesn't require use of that hints file anymore and
someone reading Makefile.src won't have to know about it, but using
those hints will make their life easier.

Simplify the Qt timestamp handling portion of compiler.370.  Only one
extra rule gets added when creating src/Makefile.

src/Makefile generated from sys/unix/Makefile.src that's been rebuilt
with 'make depend' got broken by uncommenting '#include "amiconf.h"'
in global.h.  That file isn't in include/ but every object file now
depended on it and make didn't know what to do about that.  Have
depend.awk treat it as a special case so that no object files depend
on it.  That means that actually modifying it won't trigger a rebuild;
anyone fiddling with that will have to always do 'make clean' or
'touch config.h-t' after changing it.  The alternative is to move it
from outdated/include/ back to include/.

In depend.awk, recent gawk complained that "\." wasn't a defined
escape sequence in regular expressions so it would be treated as ".".
That's exactly what is intended but change it to "[.]" to avoid the
warning.  Similarly for one instance each of "\#" and '\"'.  I also
tried changing "\/" to "[/]" even though that is a defined sequence
and doesn't trigger any warning.  gawk accepted it but the awk that
comes with OSX choked on it so I changed it back to "\/".
2022-02-05 04:15:51 -08:00
SHIRAKATA Kentaro
b87dd4423b remove redundant code
The values of lx and ly are always assigned just before their usage.
So, assignments in advance are redundant.
2022-02-05 20:31:17 +09:00
Pasi Kallinen
20054551f9 Don't push unknown boulders when moving
If you're blind and there's a boulder you don't know about,
don't automatically push it. Instead, give a message and show
the boulder on the map.
2022-02-05 11:30:35 +02:00
Pasi Kallinen
8eb00cf593 Fix thinko in drain life attack
Fixes #667
2022-02-05 10:40:45 +02:00
Pasi Kallinen
93db2a8a84 Rejigger the prefix input
Make prefix commands cancel themselves when pressed twice,
with a message saying so.

Hopefully this fixes the problems I introduced.
2022-02-05 10:05:40 +02:00
nhmall
2e3e53883f remove a workaround in Makefile.mingw32 2022-02-04 23:07:22 -05:00
nhmall
e795dd107e fix Makefile.mingw32 2022-02-04 20:26:05 -05:00
PatR
e8341dc9d7 fix github issue #666 - cursed light vs worn light
Another gold dragon scales/mail issue, reported bu vultur-cadens:
reading a cursed scroll of light extinguishes carried light sources
except for wielded Sunsword and worn gold dragon scales/mail; there
was a special message for Sunsword (preventing the hero from being in
darkness) but no such message for gold dragon scales/mail.  Replace
the special message with a more generic one applicable to both cases.

Also, implement the suggestion that cursed light degrade the amount
of light being emitted (which varies by bless/curse state) for those
two cases.  Sunsword has a 75% chance to resist, gold dragon scales
25% chance.  And add the inverse:  blessed scroll of light might
increase the amount of light by improving their bless/curse state.
The resistance check applies here too and isn't inverted; Sunsword
is still fairly likely to resist.

Uncursed scroll of light, spell of light regardless of skill, zapped
or broken wand of light have so such effect.

Closes #666
2022-02-04 16:20:03 -08:00
nhmall
0fba9cf896 .gitattributes for Xcode directory 2022-02-04 19:01:11 -05:00
nhw_cron
c673750d07 This is cron-daily v1-Feb-3-2022. 000files updated: Files 2022-02-04 18:57:10 -05:00
nhmall
2f83190f8a macOS.370 Lua 2022-02-04 18:55:12 -05:00
nhmall
ee1eff538c Lua link on Jammy Jellyfish 2022-02-04 18:03:08 -05:00
PatR
5b28db5f23 more obsolete files: DECUS C's preprocessor
Get rid sys/share/cpp[123].shr, the pre-ANSI C preprocessor that was
included in the source distribution for use on systems with ancient
C compilers whose preprocessor that couldn't cope with nethack's large
number of macros.
2022-02-04 14:34:46 -08:00
nhmall
6af710bc97 provide a Makefile target to clean the Lua submodule 2022-02-04 17:11:09 -05:00
nhw_cron
82b8175377 This is cron-daily v1-Feb-3-2022. 000files updated: Files 2022-02-04 16:58:50 -05:00
nhw_cron
6e7e676fec This is cron-daily v1-Feb-3-2022. 005guidebook updated: doc/Guidebook.txt 2022-02-04 16:11:05 -05:00
nhmall
a25259a97a more obsolete file references 2022-02-04 15:52:42 -05:00
nhmall
a71d5e3cb3 remove some obsolete file references 2022-02-04 15:43:21 -05:00
nhw_cron
789f5174f0 This is cron-daily v1-Feb-3-2022. 000files updated: Files 2022-02-04 15:38:23 -05:00
nhmall
990d672dce inadvertent space typo 2022-02-04 15:23:23 -05:00
nhkeni
1d210ed722 prevent ..files value from being pull from ..
This was creating extra nethack.ico entries in Files.
2022-02-04 15:11:04 -05:00
nhmall
6057c9813d CI update for mingw
Add GIT=1 to the make-mingw32 command
2022-02-04 15:07:32 -05:00
nhmall
b8489de8eb support use of git submodules with the Makefiles
git=1 when invoking make will use the submodule submodules/lua.

On windows, it will also use the submodule submodules/pdcurses.
2022-02-04 14:48:29 -05:00
nhmall
8499c71fcc update a couple of lagging 3.6 references 2022-02-04 12:47:05 -05:00
nhw_cron
91f7353b65 This is cron-daily v1-Feb-3-2022. 005guidebook updated: doc/Guidebook.txt 2022-02-04 12:37:06 -05:00
nhw_cron
44d0faca22 This is cron-daily v1-Feb-3-2022. 000files updated: Files 2022-02-04 11:28:41 -05:00
nhmall
3db819478f update OS terminology used in some text references 2022-02-04 11:26:14 -05:00
nhmall
5d4fc4591d more .gitattributes updates 2022-02-04 11:01:20 -05:00
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