Commit Graph

10428 Commits

Author SHA1 Message Date
nhmall
2cff164c42 clinger messaging 2019-12-17 11:47:25 -05:00
nhmall
90e4ffc0a0 flying hero should be able to pass through a hole using '>' 2019-12-17 11:32:25 -05:00
nhmall
05df5dfbf2 buffer bit 2019-12-17 01:17:49 -05:00
nhmall
51b02a7584 correct revision of one file on the commit 2019-12-17 01:07:53 -05:00
nhmall
ac6e13fd7a allow run-from-removable-device configuration on Windows
Allow a way to configure NetHack to run entirely from a USB stick
or other removable device in a way that allows everything to
reside entirely on the USB stick, and nothing on the computer's
hard drive. That could be done in versions prior to 3.6.3.

Sample:

i: is a USB stick

i:\nhdist contains the NetHack Windows distribution and a sysconf
file dropped into that distribution with the following entry in it:
	portable_device_top = nethack

No device is included in the portable_device_top entry, the device
is always the device that the nethack exe resides on. If you try
to specify a device in the portable_device_top path, the device
portion will be ignored.

portable_device_top specifies the folder on the device that is writable
by NetHack and as such it cannot be the same folder that the executable
resides in.

i:\nhdist\nethack --showpaths
Variable playground locations:
    [hackdir   ]="i:\nethack\"
    [leveldir  ]="i:\nethack\"
    [savedir   ]="i:\nethack\"
    [bonesdir  ]="i:\nethack\"
    [datadir   ]="i:\nhdist\"
    [scoredir  ]="i:\nethack\"
    [lockdir   ]="i:\nethack\"
    [sysconfdir]="i:\nhdist\"
    [configdir ]="i:\nethack\"
    [troubledir]="i:\nethack\"
NetHack's system configuration file (in sysconfdir):
    "i:\nhdist\sysconf"
The loadable symbols file (in sysconfdir):
    "i:\nhdist\symbols"
Basic data files (in datadir) are collected inside:
    "i:\nhdist\nhdat363"
No end-of-game disclosure file (disabled).
Writable folder for portable device config (sysconf portable_device_top):
    "i:\nethack\"
Your personal configuration file (in configdir):
    "i:\nethack\.nethackrc"

Without that sysconf file in the NetHack distribution folder on the
USB stick with the 'portable_device_top = '  entry, the paths
return to the default locations for 3.6.3 on Windows:

i:\nhdist\nethack --showpaths
Variable playground locations:
    [hackdir   ]="C:\Users\JaneDoe\NetHack\3.6\"
    [leveldir  ]="C:\Users\JaneDoe\AppData\Local\NetHack\3.6\"
    [savedir   ]="C:\Users\JaneDoe\AppData\Local\NetHack\3.6\"
    [bonesdir  ]="C:\ProgramData\NetHack\3.6\"
    [datadir   ]="i:\nhdist\"
    [scoredir  ]="C:\ProgramData\NetHack\3.6\"
    [lockdir   ]="C:\ProgramData\NetHack\3.6\"
    [sysconfdir]="C:\ProgramData\NetHack\3.6\"
    [configdir ]="C:\Users\JaneDoe\NetHack\"
    [troubledir]="C:\Users\JaneDoe\NetHack\3.6\"
NetHack's system configuration file (in sysconfdir):
    "C:\ProgramData\NetHack\3.6\sysconf"
The loadable symbols file (in sysconfdir):
    "C:\ProgramData\NetHack\3.6\symbols"
Basic data files (in datadir) are collected inside:
    "i:\nhdist\nhdat363"
No end-of-game disclosure file (disabled).
Your personal configuration file (in configdir):
    "C:\Users\JaneDoe\NetHack\.nethackrc"
2019-12-17 00:41:55 -05:00
nhmall
edd9d5b810 flying hero should be able to pass through a hole using '>' 2019-12-16 00:25:20 -05:00
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
nhmall
c13695b89d Merge branch 'NetHack-3.6' into housekeeping-to-merge-at-3.6.4-release 2019-12-15 12:44:53 -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
PatR
3f457b664b finalize fixes36.4 2019-12-14 16:06:07 -08:00
PatR
b76f7a9ae9 update config-overflow-fix with recent 3.6 changes 2019-12-14 16:03:10 -08: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
dacf025262 typos 2019-12-13 18:39:31 -05:00
nhmall
6a3b9c2f52 housekeeping updates for 3.6.4 2019-12-13 18:37:36 -05: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
40789b7070 fix potential buffer overflow loading config file 2019-12-13 13:36:38 -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