Commit Graph

9860 Commits

Author SHA1 Message Date
nhmall
e8f313bc2d Merge branch 'master' into NetHack-3.7 2019-12-15 18:23:12 -05:00
nhmall
02c43fc927 Merge branch 'NetHack-3.6' 2019-12-15 18:03:19 -05:00
nhmall
a2a000656f mistake file 2019-12-15 17:59:48 -05:00
nhmall
3ad628d1e5 more makedefs 2019-12-15 17:41:27 -05:00
nhmall
c201c5608b report post-release in makedefs if someone happens to build post-release code 2019-12-15 17:22:11 -05:00
nhmall
caec4e39f5 Merge branch 'master' into NetHack-3.7 2019-12-15 14:56:10 -05:00
nhmall
d952eea4eb Merge branch 'NetHack-3.6' 2019-12-15 14:55:53 -05:00
Patric Mueller
9085093338 Fix compilation on platforms that split the ncurses and tinfo libraries
Some platforms compile ncurses in such a way that the tinfo library needs to
be separately linked in (e.g. Gentoo).

The tinfo library is a low-level library being used by and bundled with
ncurses.

Adding '-ltinfo' to WINTTYLIB in the hint files was considered the most robust
solution to this problem.  This still works on systems with ncurses 5.9.
Using pkg-config was ruled out as the default build of ncurses doesn't install
the necessary files.
2019-12-15 20:38:44 +01:00
nhmall
b956e1a205 silence some compiler warnings that showed up recently 2019-12-15 14:03:25 -05:00
nhmall
a52d02df07 Merge branch 'master' into NetHack-3.7 2019-12-15 13:21:56 -05:00
nhmall
a78c8a5526 Merge branch 'NetHack-3.6' 2019-12-15 13:21:23 -05:00
nhw_cron
d654a4f5d1 This is cron-daily v1-Dec-12-2019. guidebook updated: doc/Guidebook.txt 2019-12-15 13:19:35 -05:00
keni
be01fba97a add date to Guidebook.mn title page 2019-12-15 12:38:42 -05:00
Pasi Kallinen
b24f4c5929 Expose traps to lua 2019-12-15 18:16:41 +02:00
nhw_cron
6a71759797 This is cron-daily v1-Dec-12-2019. files updated: Files 2019-12-14 18:15:28 -05:00
nhmall
fae36c6b86 Merge branch 'NetHack-3.6' 2019-12-14 17:35:03 -05:00
nhmall
0569f2b24a dependency in an old amiga file picked the wrong file
however, the file with the dependency no longer exists in the repo anyway
so there's a lot more that would be in need of repair
2019-12-14 17:28:31 -05:00
nhmall
5cdc5a0007 Windows Makefile bit 2019-12-14 17:21:10 -05:00
nhmall
480c3eb6e0 include/lev.h is an empty header file so just get rid of it 2019-12-14 17:18:48 -05:00
nhmall
65e89507f1 cron-daily Files 2019-12-14 13:41:29 -05:00
nhmall
f4720edfbf include/qtext.h is an empty header so just get rid of it 2019-12-14 12:31:29 -05:00
nhmall
2dad98d55e Xcode updates 2019-12-14 10:53:12 -05:00
PatR
80f52d5d53 finish moving a couple of short patches to 3.6.4
And make the revised teleport portion match.
2019-12-13 17:54:00 -08:00
PatR
c0b74f6ba4 fixes typo 2019-12-13 17:39:39 -08:00
nhmall
057fff6b7c Merge branch 'NetHack-3.6' 2019-12-13 20:03:47 -05:00
PatR
84bdff6976 kinda/sorta fix github issue #246
Cherry-pick 3.7.0's 565e020573.  Again,
conflict because the fixes entry goes into a different file.

When picking up from floor or removing from container fails because
there aren't any inventory slots available, pickup/take-out stops.
But the message
|Your knapsack can't accomodate any more items.
is inaccurate if there is gold beyond the stopping point.  Actually
continuing in order to pickup/take-out gold would require substantial
changes, but varying the message to be
|Your knapsack can't accomodate any more items (except gold).
when stopping is a one line fix.  The parenthesized remark is only
added if there is actually some gold after the current object and is
given regardless of whether autopickup happens to be targetting it.

Fixes #246
2019-12-13 16:15:37 -08:00
PatR
f8fbe4e989 allow teleport onto the vibrating square
Cherry-pick 3.7.0's 4a3d5f95d9
(github pull request #252).  Slightly tricky because the fix entry
nowgoes into a different file.  fixes37.0 will need fixing up.
2019-12-13 15:58:56 -08:00
nhmall
2592db64e3 Merge branch 'NetHack-3.7' 2019-12-13 17:41:03 -05:00
nhmall
f48ac58561 Merge branch 'NetHack-3.6' 2019-12-13 17:37:46 -05:00
PatR
62c271f21b polymorphed steed phrasing
When you ride your steed into a polymorph trap and it changes into a
creature that can still wear the saddle, the message is
|You have to adjust youself in the saddle on <foo>.
which sounds as if the game is telling the player that he or she needs
to do something.  Simplify it to
|You adjust yourself in the saddle on <foo>.
2019-12-13 14:01:28 -08:00
PatR
a619ae2879 EDIT_GETLIN vs #wizload*
For #wizloadlua and #wizloaddes, getlin() was using garbage for
default answer.
2019-12-12 17:49:32 -08:00
PatR
49fdd32d4f comment typo 2019-12-12 12:16:50 -08:00
Pasi Kallinen
1d9ba3e212 Expose objects array to lua 2019-12-12 13:39:20 +02:00
Pasi Kallinen
027024d27f More wish parser tests 2019-12-12 07:58:06 +02:00
PatR
a28b8e85a2 fix a couple of nhlobj.c warnings
unused: 'buf[]'
plain char subscript: [obj->oclass]
2019-12-11 12:48:31 -08:00
PatR
f0559065ff set_savefile_name typo fix
The one typo or spelling fix submitted for to-be-3.7.0 that didn't
also apply to 3.6.3.
2019-12-11 12:43:32 -08:00
PatR
8a57029503 spelling and typo fixes
Submitted for 3.7.0; all but one also apply to 3.6.3.

I rewrote the curses terminal-too-small message instead of just
fixing the spelling of "minumum".
2019-12-11 12:35:45 -08:00
Pasi Kallinen
7043e2134a Lua NetHack obj bindings 2019-12-11 20:10:59 +02:00
PatR
1c30c437c3 'make' => 'make all'
In sys/unix/Makefile.{top,src}, move the 'all' target first so that
it's the default if no target is specified.  Recent lua handling
unintentionally broke that for Makefile.top by putting 'lua_support'
target in front of 'all'.
2019-12-09 15:02:30 -08:00
PatR
2fe31eec46 more Qt rename
In order for 'make depend' to be able to handle both Qt4/5 and Qt3,
they need to operate on different object file names.

renames qt*.o to qt3*.o for Qt3
renames qt*.cpp to qt3*.cpp for Qt3 (not essential but seems worthwhile)
moves Qt3's headers from include/qt*.h to win/Qt3/qt3*.h
copies include/qt_xpms.h (before rename) or win/Qt3/qt3_xpms.h (after)
    to win/Qt/qt_xpms.h so that Qt4/5 no longer shares one header file
modifies win/Qt3/*.cpp and win/Qt3/qt3_win.h to reflect new header names
modifies Makefile.src to have Qt3 'moc' commands use new names
updates Makefile.src via re-running 'make depend'

'make depend' was only looking at include/*.h to find nested inclusion.
Now it will also look at win/*/*.h.  That found a bunch of missing
dependencies for the old gnome sources and a few for Qt3.

Building without Qt still works.  Building with it (any version) has
not been tested.
2019-12-09 11:15:49 -08:00
Patric Mueller
cb2e02ef75 Merge branch 'copperwater-vs_teleport' into NetHack-3.7
Closes #252
2019-12-08 20:00:31 +01:00
copperwater
4a3d5f95d9 Allow teleportation onto the Vibrating Square
It's a minor annoyance when you forget you can't do this in vanilla and
then get relocated somewhere random on the level. Since it's not a
harmful "trap", just allow the adventurer to teleport directly onto it.
2019-12-08 19:57:35 +01:00
PatR
d43f8f6f9e altar color revisited
The issue of mimics masquerading as altars just came up two weeks
ago but never entered my mind when I worked on this yesterday.
2019-12-08 10:36:52 -08:00
PatR
625bfd1efd questpgr memory bug
Pointed out by heaputil:  attempt to free null pointer.  ANSI C
allows that, so no crash, but it still indicates a mistake.
2019-12-08 10:33:38 -08:00
Patric Mueller
b9f3a33ec9 Update depend.awk for the new Qt location and lua headers 2019-12-08 14:41:54 +01:00
nhmall
e81f761969 patchlevel 2019-12-08 08:02:39 -05:00
nhmall
8a47f13935 more files 2019-12-08 07:35:43 -05:00
nhmall
f78b4db7f0 more files 2019-12-08 07:32:58 -05:00
nhmall
bc8c1f8f56 remove field-level savefile code 2019-12-08 07:27:01 -05:00
Pasi Kallinen
2cb46c4153 Initialize object containment field
This is 3.7 bug caused by the lua implementation, so no fixes entry.
2019-12-08 11:53:01 +02:00