Commit Graph

7415 Commits

Author SHA1 Message Date
Bart House
3bb5c84bc7 Fix g.restoring comments. 2018-11-23 13:30:32 -08:00
Bart House
3394362f82 topl.c globals moved to instance_globals. 2018-11-23 13:13:28 -08:00
Bart House
97feda46e0 Moved sex_change_ok to instance_globals. 2018-11-23 12:43:38 -08:00
Bart House
302cd789e8 Fix compiler warnings in macos build. 2018-11-23 12:27:55 -08:00
Bart House
5e6e184c82 define nhassert if not defined by port. 2018-11-23 11:27:40 -08:00
Bart House
9177cc642b Moved potion.c globals to instance_globals. 2018-11-23 11:23:03 -08:00
Bart House
43cc162cf9 Moved read.c globals to instance_globals. 2018-11-23 10:47:52 -08:00
Bart House
c91d560591 restore.c globals moved to instance_globals. 2018-11-23 10:36:45 -08:00
Bart House
9e40a1dfae Renamed UNDEFINED to UNDEFINED_VALUE. 2018-11-23 10:22:01 -08:00
Bart House
4744eeb765 rfilter initialized to UNDEFINED. 2018-11-23 10:15:22 -08:00
Bart House
ee8ce55b7b rumors.c static globals moved to instance_globals. 2018-11-23 10:05:21 -08:00
Bart House
dfc8f071f6 Renamed instance_variables to global_variables and iv to g. 2018-11-23 09:27:10 -08:00
Bart House
a188bc5d40 Instance variable work. 2018-11-23 05:13:06 -08:00
Bart House
53791ab1de Instance variable work check-point. 2018-11-23 04:49:51 -08:00
Bart House
47b1d71bf3 Merge branch 'win-bart' of https://rodney.nethack.org:20040/git/NHsource into win-bart 2018-11-22 22:19:47 -08:00
Bart House
8111624d0e Initial check in of icontext work. 2018-11-22 22:17:03 -08:00
Bart House
b74330f0aa Merge branch 'win-bart' of https://rodney.nethack.org:20040/git/NHsource into win-bart 2018-11-22 22:07:22 -08:00
Bart House
f305d1ab6c Fixed nocreate. 2018-11-22 22:06:55 -08:00
Bart House
f8ab311e3d Fixed nocreate. 2018-11-22 21:55:03 -08:00
Bart House
f0f0dea993 check. 2018-11-22 21:40:15 -08:00
Bart House
ae9462e7f7 Merge branch 'win-bart' of https://rodney.nethack.org:20040/git/NHsource into win-bart 2018-11-22 21:39:57 -08:00
Bart House
455d2769e0 Initial check-in of icontext work. 2018-11-22 20:53:24 -08:00
Bart House
0ebe905ad1 Initial check in of icontext. 2018-11-22 20:47:22 -08:00
Bart House
48c89acef4 Moved petname_used to decl.c 2018-11-22 15:49:43 -08:00
Bart House
79e0a11c15 Previous encumberance state moved to decl.c. 2018-11-22 15:40:31 -08:00
Bart House
6737fee07d Added decl_early_init() which is called when PLAYAGAIN is supported.
decl_early_init() is called when we are starting a game.  On first
start, it validates that global state is in the expected state.
When called on subsequent starts, it initializes global state to
expected state.
2018-11-22 15:20:17 -08:00
Bart House
3e8d98dee5 Added nhassert() support. 2018-11-22 15:03:26 -08:00
Bart House
95208cff1d Added nhassert() support to tile2bmp. 2018-11-22 15:03:00 -08:00
Bart House
d5c792a87c Revert "Modified how we initialize save file info."
This reverts commit 250ca464bc.
2018-11-22 14:21:31 -08:00
Bart House
c1dbae9f1f Added PLAYAGAIN experimental support definition. 2018-11-22 13:05:44 -08:00
Bart House
250ca464bc Modified how we initialize save file info.
There should be no net change other then improving code maintenance.
2018-11-22 13:01:58 -08:00
Bart House
247626dfe5 Removed unnecessary use of static for nocreate values.
If multiple games are played without exiting the process, on the second
new player creation the nocreate values will already be set based
on the first player creation.
2018-11-22 12:49:10 -08:00
Pasi Kallinen
02749b7621 Fix guard shoving monsters away coordinate logic
The logic required both x and y coordinates of the guard location and
the new location the guard wanted to move to be different. This is
obviously wrong, as the guard may move horizontally or vertically.
2018-11-22 20:25:03 +02:00
PatR
ac9bdc8aa7 fix #H7585 - can't untrap from edge of pit
Attempting to untrap an adjacent location failed if you had escaped a
pit, claiming that you couldn't reach.  You can't reach the bottom of
the pit if you're not in it, but you should be able to reach adjacent
spots normally.
2018-11-21 19:16:23 -08:00
PatR
55ad316079 more Schroedinger's Cat
Prevent food detection--scroll or crystal ball--from noticing the cat
corpse inside SchroedingersBox since its presence is tentative and
resolving its status during detection is a huge can of worms (live cat
placement on map from inside locked box, parallel resolution required
for monster detection/warning/telepathy that would render the box
fairly useless since it would probably end up getting resolved by ESP
before hero gains access).

Prevent cat corpse in the Box from being added to shop bill if unpaid
Box is picked up.  That prevents it from being listed as a bought item
if the player buys the box (instead of being described as unknown
contents; an older, more general bug which still hasn't been fixed).

As far as I'm aware, off the revised handling of Schroedingers Cat is
finished.
2018-11-21 18:32:04 -08:00
PatR
4ee6b13033 vmsbuild.com update
A copyright header inserted last spring uses the wrong format for a
DCL comment and triggers a couple of warnings about invalid commands.

Some linker hackery added a long time ago draws complaints from the
linker on IA64.  This was noticed during the release cycle for 3.6.0
but then went unaddressed.
2018-11-21 16:47:42 -08:00
nhmall
86637bb4ef fuzzer fixes on windows for testing 2018-11-21 18:50:02 -05:00
Pasi Kallinen
030efe84fa Map column 0 is not a valid location 2018-11-21 19:17:08 +02:00
PatR
2beb36fc61 Schroedinger's Cat
If hero was carrying Schroedinger's Box at end of game, disclosing
inventory converted it into an ordinary box.  That interferred with
subsequent disclosure when writing DUMPLOG, which saw an empty box
if inventory had been shown or the special box with newly-determined
contents if not.  I tried a couple of ways to fix it and decided
that redoing it was better in the long run.

Schroedinger's box is still flagged with box->spe = 1, but instead
of having that affect the box's weight, now there is always a cat
corpse in the box.  When opened, that will already be in place for
a dead cat or be discarded for a live one, but the weight will be
standard for container+contents and when box->cknown is set it will
always be "containing 1 item" (which might turn out to be a monster).

Some temporary code fixes up old save/bones files to stay compatible.

TODO:  food detection used to skip Schroedinger's Box; now it will
always find a corpse, so some fixup like the ridiculous probing code
is needed.
2018-11-21 03:10:49 -08:00
nhmall
03ef9da591 Merge branch 'macosx-curses-fall2018' into NetHack-3.6.2-beta01 2018-11-20 21:01:48 -05:00
nhmall
f295b00ad1 fixes updates for curses and Xcode 2018-11-20 21:00:03 -05:00
PatR
50cb52ab31 sentence spacing
Use two spaces between sentences.  This only fixes the instances of
one-space that were fairly easy to find.
2018-11-20 17:56:16 -08:00
nhmall
b4be8852a4 suppress compiler warning differently 2018-11-20 20:30:44 -05:00
Bart House
36be0c0f0c Merge branch 'macosx-curses-fall2018' of https://rodney.nethack.org:20040/git/NHsource into macosx-curses-fall2018 2018-11-20 16:11:42 -08:00
Bart House
d10a18ff00 Switching back to tty on picked by default for XCode biuld. 2018-11-20 16:11:22 -08:00
nhmall
4228cf534e follow-up bits 2018-11-20 19:09:05 -05:00
nhmall
1980acb757 Merge branch 'win-curses' into macosx-curses-fall2018 2018-11-20 18:12:41 -05:00
Bart House
b195025635 Added all header files to Xcode project. 2018-11-20 13:22:48 -08:00
PatR
d15dacc44c fix #H7530 - corpse from corpseless monster
Migrating monster attempting to arrive on a level which is already
full of monsters gets killed off.  It was leaving a corpse without
regard for whether it was a type of of monster which should never
leave corpses.

I'd prefer that it be put back on the migrating_mons list rather
than be killed off, but this just suppresses impossible corpses.
2018-11-20 13:13:23 -08:00
Bart House
aa939a62b0 Adding README for building NetHack with XCode. 2018-11-20 11:16:24 -08:00