Commit Graph

7378 Commits

Author SHA1 Message Date
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
Bart House
da1e7de925 Adjusted compiler settings to reduce warnings in XCode project. 2018-11-20 10:51:03 -08:00
Bart House
2a6bd3e8ac Addressed compiler warnings.
Added the initialization of several locals.
In check_fields, validate that we have a valid index (idx) before using.
2018-11-20 10:48:44 -08:00
Bart House
520b130a5c Added initialization of locals to quite compiler warnings. 2018-11-20 10:47:12 -08:00
Bart House
d177b5e705 Addressed compiler warnings.
Fixed declarations of draw_classic, draw_vertical and draw_horizontal.
Moved definitions of locals before code.  Added initialization of
locals.  Changed comments to c-style.
2018-11-20 10:46:45 -08:00
Bart House
e66a8c4c73 Changed comments to c-style. 2018-11-20 10:45:04 -08:00
Bart House
347c45b420 Addressed compiler warnings.
Changed to c-style comments.  Placed locals before code.  Added
initialization of local value ret in curses_block.
2018-11-20 10:44:44 -08:00
Bart House
fcb28cd2e5 Addressed compiler warnings.
Moved local declarations before code. Changed comments to c-style.
2018-11-20 10:43:35 -08:00
Bart House
616e946393 Scoped existing code in a new block to quite compiler warnings. 2018-11-20 10:42:13 -08:00
Bart House
0b1e975b07 Addressed compiler warnings.
Moved locals before code.  Changed comment type.
2018-11-20 10:35:25 -08:00
Bart House
be11d50d91 Added use of SCCS_Id to quite compiler warnings. 2018-11-20 10:33:36 -08:00
Bart House
c987a3dc2f Added initialization of locals in create_room() to quite compiler warnings. 2018-11-20 10:30:11 -08:00
Bart House
a19b05d262 Added initialization of cc in do_look() to quite compiler warnings. 2018-11-20 10:29:05 -08:00
Bart House
d1cd20998f Added initialization if ilet to quite compiler warnings. 2018-11-20 10:27:35 -08:00
Bart House
7f4a4188a0 Added initialization of newlevel to quite compiler warnings. 2018-11-20 10:27:09 -08:00
Bart House
8799f05904 Fix lrand48 and srand48 declarations. 2018-11-20 10:26:09 -08:00
Bart House
8c61ac476d Fixed HACKDIR buid setting. 2018-11-20 07:32:23 -08:00
Groot
f768197074 Created mechanism to provide development team ID which is git friendly.
Please see XCodeConfig.xcconfig for details.
2018-11-20 01:14:18 -08:00
Bart House
9f8b419ec8 Added necessary build dependencies for xcode project. 2018-11-19 19:58:21 -08:00
Bart House
a68a8f21d4 Full build of nethack now supported in xcode. 2018-11-19 19:48:01 -08:00
Bart House
1af98716f2 Added the building of nhdat to xcode project. 2018-11-19 17:23:04 -08:00
Bart House
dd9ca9202c Added building of nhdat to xcode project. 2018-11-19 16:54:31 -08:00
PatR
ffac5f1a65 life-saving vs sickness
Replace an old instance of direct manipulation of an intrinsic.
If life-saving occurs 1 turn before sickness will kill the hero,
the sickness if cured.  But it was leaving delated_killer for SICK
allocated.  Harmless but a bug none the less.
2018-11-19 16:24:10 -08:00
Bart House
6cf6e3c750 Added support for building Guidebook in xcode build. 2018-11-19 16:22:16 -08:00
PatR
46184c06af \#stats - delayed_killer
Include memory allocated to delayed killer(s) in #stats feedback.
2018-11-19 16:22:10 -08:00
Bart House
abb59e7283 Added building dungeon to xcode project. 2018-11-19 14:51:24 -08:00
Bart House
8dc9a3d930 Merge branch 'macosx-curses-fall2018' of https://rodney.nethack.org:20040/git/NHsource into macosx-curses-fall2018 2018-11-19 14:11:59 -08:00
Bart House
9f525b3241 Added building of special and quest levels in xcode build. 2018-11-19 14:11:39 -08:00
nhmall
becfe90bfc more .gitignore updates for XCode 2018-11-19 16:27:57 -05:00
Bart House
d1b6581c08 Added building of more resources in xcode build. 2018-11-19 13:03:06 -08:00
Pasi Kallinen
b54dda5624 More monster location sanity checks
Placing a monster over already existing one will now complain.
Define EXTRA_SANITY_CHECKS to check monster removal too.
2018-11-19 22:38:16 +02:00
Bart House
cbe2669e05 Removing personal data. 2018-11-19 12:17:37 -08:00
Bart House
d83ae1a4da Adding the ignoring of xcuserdata. 2018-11-19 12:17:20 -08:00
Bart House
f47893258d Removed personal user data. 2018-11-19 12:14:45 -08:00
Bart House
b2e65ad9cd Adding the ignoring of xcuserdata. 2018-11-19 12:14:27 -08:00
Bart House
f221db4a94 Added NH_INC_DIR to xcode project build settings. 2018-11-19 12:13:58 -08:00
Pasi Kallinen
5acddebb3c Init long worm even if it does not have a tail
Long worms with no tail parts still apparently need to have
the zero-length tail placed.
2018-11-19 22:09:18 +02:00
Pasi Kallinen
20b47b5bbd Replace long worm on map after removing tail with wormgone
Calling wormgone will also remove the long worm monster from
the map, not just the worm tail. Put the monster back on map
so relmon can actually remove it properly.
2018-11-19 22:04:36 +02:00