]> granicus.if.org Git - nethack/log
nethack
6 years agoRevert "rumors.c static globals moved to instance_globals."
nhmall [Sat, 24 Nov 2018 03:17:05 +0000 (22:17 -0500)]
Revert "rumors.c static globals moved to instance_globals."

This reverts commit 6a78b203e425d2d355195c865036866ed4661a65.

6 years agoRevert "rfilter initialized to UNDEFINED."
nhmall [Sat, 24 Nov 2018 03:17:03 +0000 (22:17 -0500)]
Revert "rfilter initialized to UNDEFINED."

This reverts commit 716c2ceccfd9f8e6efda03942f7135a4cd9e2eeb.

6 years agoRevert "Renamed UNDEFINED to UNDEFINED_VALUE."
nhmall [Sat, 24 Nov 2018 03:17:01 +0000 (22:17 -0500)]
Revert "Renamed UNDEFINED to UNDEFINED_VALUE."

This reverts commit cee4933c244c03e813cbd6d10c8c61104ccc27fd.

6 years agoRevert "restore.c globals moved to instance_globals."
nhmall [Sat, 24 Nov 2018 03:16:59 +0000 (22:16 -0500)]
Revert "restore.c globals moved to instance_globals."

This reverts commit 865c4d5a7d64250ad97db4267b4b46282ec31b27.

6 years agoRevert "Moved read.c globals to instance_globals."
nhmall [Sat, 24 Nov 2018 03:16:56 +0000 (22:16 -0500)]
Revert "Moved read.c globals to instance_globals."

This reverts commit d37a91a6b8bdbead0f64187b54167e3a430fcb19.

6 years agoRevert "Moved potion.c globals to instance_globals."
nhmall [Sat, 24 Nov 2018 03:16:54 +0000 (22:16 -0500)]
Revert "Moved potion.c globals to instance_globals."

This reverts commit d3c192e5a800301f862edce8e75904408037c9ce.

6 years agoRevert "define nhassert if not defined by port."
nhmall [Sat, 24 Nov 2018 03:16:52 +0000 (22:16 -0500)]
Revert "define nhassert if not defined by port."

This reverts commit cff9fb441a59d06134b731c57d84fe9c1b2143a0.

6 years agoRevert "Fix compiler warnings in macos build."
nhmall [Sat, 24 Nov 2018 03:16:49 +0000 (22:16 -0500)]
Revert "Fix compiler warnings in macos build."

This reverts commit 0d59f1a22bb6280999eed2bb2fb567c80a96a17d.

6 years agoRevert "Moved sex_change_ok to instance_globals."
nhmall [Sat, 24 Nov 2018 03:16:47 +0000 (22:16 -0500)]
Revert "Moved sex_change_ok to instance_globals."

This reverts commit ee22210a6860572dac9d0f95cbc0067a755431cf.

6 years agoRevert "topl.c globals moved to instance_globals."
nhmall [Sat, 24 Nov 2018 03:16:45 +0000 (22:16 -0500)]
Revert "topl.c globals moved to instance_globals."

This reverts commit b384223e1be79a2f12c9db7b8097b3a51d3a96aa.

6 years agoRevert "Fix g.restoring comments."
nhmall [Sat, 24 Nov 2018 03:16:42 +0000 (22:16 -0500)]
Revert "Fix g.restoring comments."

This reverts commit ad725c0f0f50728100d9cca28cfaaae50cb4ca94.

6 years agoRevert "Moved pickup globals to instance_globals."
nhmall [Sat, 24 Nov 2018 03:16:40 +0000 (22:16 -0500)]
Revert "Moved pickup globals to instance_globals."

This reverts commit 01596f166095f307eed6c705590cb7e0dd024f10.

6 years agoRevert "objnam.c globals moved to instance globals."
nhmall [Sat, 24 Nov 2018 03:16:35 +0000 (22:16 -0500)]
Revert "objnam.c globals moved to instance globals."

This reverts commit 041e55467aecbecdc40539df38daafddbcc09acd.

6 years agoRevert "Modified objects initialization to support re-entry."
nhmall [Sat, 24 Nov 2018 03:16:24 +0000 (22:16 -0500)]
Revert "Modified objects initialization to support re-entry."

This reverts commit c3eefefc991999ef2f322dabd439d3bca601fe32.

6 years agoRevert "Removing prototype for decl_globals_init()."
nhmall [Sat, 24 Nov 2018 03:15:37 +0000 (22:15 -0500)]
Revert "Removing prototype for decl_globals_init()."

This reverts commit 26d03b5017c74c7b1895af16e9f273820b04b67f.

6 years agoRemoving prototype for decl_globals_init().
Bart House [Fri, 23 Nov 2018 23:47:18 +0000 (15:47 -0800)]
Removing prototype for decl_globals_init().

6 years agoMerge branch 'win-bart' of https://rodney.nethack.org:20040/git/NHsource into win...
Bart House [Fri, 23 Nov 2018 23:23:06 +0000 (15:23 -0800)]
Merge branch 'win-bart' of https://rodney.nethack.org:20040/git/NHsource into win-bart

6 years agoModified objects initialization to support re-entry.
Bart House [Fri, 23 Nov 2018 23:13:22 +0000 (15:13 -0800)]
Modified objects initialization to support re-entry.

6 years agoobjnam.c globals moved to instance globals.
Bart House [Fri, 23 Nov 2018 21:37:30 +0000 (13:37 -0800)]
objnam.c globals moved to instance globals.

6 years agoMoved pickup globals to instance_globals.
Bart House [Fri, 23 Nov 2018 21:30:51 +0000 (13:30 -0800)]
Moved pickup globals to instance_globals.

6 years agoFix g.restoring comments.
Bart House [Fri, 23 Nov 2018 21:30:32 +0000 (13:30 -0800)]
Fix g.restoring comments.

6 years agotopl.c globals moved to instance_globals.
Bart House [Fri, 23 Nov 2018 21:13:28 +0000 (13:13 -0800)]
topl.c globals moved to instance_globals.

6 years agoMoved sex_change_ok to instance_globals.
Bart House [Fri, 23 Nov 2018 20:43:38 +0000 (12:43 -0800)]
Moved sex_change_ok to instance_globals.

6 years agoFix compiler warnings in macos build.
Bart House [Fri, 23 Nov 2018 20:27:55 +0000 (12:27 -0800)]
Fix compiler warnings in macos build.

6 years agodefine nhassert if not defined by port.
Bart House [Fri, 23 Nov 2018 19:27:40 +0000 (11:27 -0800)]
define nhassert if not defined by port.

6 years agoMoved potion.c globals to instance_globals.
Bart House [Fri, 23 Nov 2018 19:23:03 +0000 (11:23 -0800)]
Moved potion.c globals to instance_globals.

6 years agoMoved read.c globals to instance_globals.
Bart House [Fri, 23 Nov 2018 18:47:52 +0000 (10:47 -0800)]
Moved read.c globals to instance_globals.

6 years agorestore.c globals moved to instance_globals.
Bart House [Fri, 23 Nov 2018 18:36:45 +0000 (10:36 -0800)]
restore.c globals moved to instance_globals.

6 years agoRenamed UNDEFINED to UNDEFINED_VALUE.
Bart House [Fri, 23 Nov 2018 18:22:01 +0000 (10:22 -0800)]
Renamed UNDEFINED to UNDEFINED_VALUE.

6 years agorfilter initialized to UNDEFINED.
Bart House [Fri, 23 Nov 2018 18:15:22 +0000 (10:15 -0800)]
rfilter initialized to UNDEFINED.

6 years agorumors.c static globals moved to instance_globals.
Bart House [Fri, 23 Nov 2018 18:05:21 +0000 (10:05 -0800)]
rumors.c static globals moved to instance_globals.

6 years agoRenamed instance_variables to global_variables and iv to g.
Bart House [Fri, 23 Nov 2018 17:27:10 +0000 (09:27 -0800)]
Renamed instance_variables to global_variables and iv to g.

6 years agoInstance variable work.
Bart House [Fri, 23 Nov 2018 13:13:06 +0000 (05:13 -0800)]
Instance variable work.

6 years agoInstance variable work check-point.
Bart House [Fri, 23 Nov 2018 12:49:51 +0000 (04:49 -0800)]
Instance variable work check-point.

6 years agoFixed nocreate.
Bart House [Fri, 23 Nov 2018 05:55:03 +0000 (21:55 -0800)]
Fixed nocreate.

6 years agocheck.
Bart House [Fri, 23 Nov 2018 05:40:15 +0000 (21:40 -0800)]
check.

6 years agoInitial check in of icontext.
Bart House [Fri, 23 Nov 2018 04:47:22 +0000 (20:47 -0800)]
Initial check in of icontext.

6 years agoMoved petname_used to decl.c
Bart House [Thu, 22 Nov 2018 23:49:43 +0000 (15:49 -0800)]
Moved petname_used to decl.c

6 years agoPrevious encumberance state moved to decl.c.
Bart House [Thu, 22 Nov 2018 23:40:31 +0000 (15:40 -0800)]
Previous encumberance state moved to decl.c.

6 years agoAdded decl_early_init() which is called when PLAYAGAIN is supported.
Bart House [Thu, 22 Nov 2018 23:20:17 +0000 (15:20 -0800)]
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.

6 years agoAdded nhassert() support.
Bart House [Thu, 22 Nov 2018 23:03:26 +0000 (15:03 -0800)]
Added nhassert() support.

6 years agoAdded nhassert() support to tile2bmp.
Bart House [Thu, 22 Nov 2018 23:03:00 +0000 (15:03 -0800)]
Added nhassert() support to tile2bmp.

6 years agoRevert "Modified how we initialize save file info."
Bart House [Thu, 22 Nov 2018 22:21:31 +0000 (14:21 -0800)]
Revert "Modified how we initialize save file info."

This reverts commit 250ca464bc2aa5ec565b73c2cbaf9308c8592a70.

6 years agoAdded PLAYAGAIN experimental support definition.
Bart House [Thu, 22 Nov 2018 21:05:44 +0000 (13:05 -0800)]
Added PLAYAGAIN experimental support definition.

6 years agoModified how we initialize save file info.
Bart House [Thu, 22 Nov 2018 21:01:58 +0000 (13:01 -0800)]
Modified how we initialize save file info.

There should be no net change other then improving code maintenance.

6 years agoRemoved unnecessary use of static for nocreate values.
Bart House [Thu, 22 Nov 2018 18:15:43 +0000 (10:15 -0800)]
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.

6 years agoModified objects initialization to support re-entry.
Bart House [Fri, 23 Nov 2018 23:13:22 +0000 (15:13 -0800)]
Modified objects initialization to support re-entry.

6 years agoobjnam.c globals moved to instance globals.
Bart House [Fri, 23 Nov 2018 21:37:30 +0000 (13:37 -0800)]
objnam.c globals moved to instance globals.

6 years agoMoved pickup globals to instance_globals.
Bart House [Fri, 23 Nov 2018 21:30:51 +0000 (13:30 -0800)]
Moved pickup globals to instance_globals.

6 years agoFix g.restoring comments.
Bart House [Fri, 23 Nov 2018 21:30:32 +0000 (13:30 -0800)]
Fix g.restoring comments.

6 years agotopl.c globals moved to instance_globals.
Bart House [Fri, 23 Nov 2018 21:13:28 +0000 (13:13 -0800)]
topl.c globals moved to instance_globals.

6 years agoMoved sex_change_ok to instance_globals.
Bart House [Fri, 23 Nov 2018 20:43:38 +0000 (12:43 -0800)]
Moved sex_change_ok to instance_globals.

6 years agoFix compiler warnings in macos build.
Bart House [Fri, 23 Nov 2018 20:27:55 +0000 (12:27 -0800)]
Fix compiler warnings in macos build.

6 years agodefine nhassert if not defined by port.
Bart House [Fri, 23 Nov 2018 19:27:40 +0000 (11:27 -0800)]
define nhassert if not defined by port.

6 years agoMoved potion.c globals to instance_globals.
Bart House [Fri, 23 Nov 2018 19:23:03 +0000 (11:23 -0800)]
Moved potion.c globals to instance_globals.

6 years agoMoved read.c globals to instance_globals.
Bart House [Fri, 23 Nov 2018 18:47:52 +0000 (10:47 -0800)]
Moved read.c globals to instance_globals.

6 years agorestore.c globals moved to instance_globals.
Bart House [Fri, 23 Nov 2018 18:36:45 +0000 (10:36 -0800)]
restore.c globals moved to instance_globals.

6 years agoRenamed UNDEFINED to UNDEFINED_VALUE.
Bart House [Fri, 23 Nov 2018 18:22:01 +0000 (10:22 -0800)]
Renamed UNDEFINED to UNDEFINED_VALUE.

6 years agorfilter initialized to UNDEFINED.
Bart House [Fri, 23 Nov 2018 18:15:22 +0000 (10:15 -0800)]
rfilter initialized to UNDEFINED.

6 years agorumors.c static globals moved to instance_globals.
Bart House [Fri, 23 Nov 2018 18:05:21 +0000 (10:05 -0800)]
rumors.c static globals moved to instance_globals.

6 years agoSend travis notification mails to mailing list
Patric Mueller [Fri, 23 Nov 2018 17:56:25 +0000 (18:56 +0100)]
Send travis notification mails to mailing list

6 years agoRenamed instance_variables to global_variables and iv to g.
Bart House [Fri, 23 Nov 2018 17:27:10 +0000 (09:27 -0800)]
Renamed instance_variables to global_variables and iv to g.

6 years agoAdd some commented out flags to linux hints file
Pasi Kallinen [Fri, 23 Nov 2018 17:20:59 +0000 (19:20 +0200)]
Add some commented out flags to linux hints file

6 years agoAdding a travis job for a minimal build
Patric Mueller [Fri, 23 Nov 2018 15:22:41 +0000 (16:22 +0100)]
Adding a travis job for a minimal build

6 years agoBuilding tty, X11, and QT5 builds on Travis
Patric Mueller [Wed, 14 Nov 2018 14:28:37 +0000 (15:28 +0100)]
Building tty, X11, and QT5 builds on Travis

6 years agoifdef, not if
Pasi Kallinen [Fri, 23 Nov 2018 13:15:04 +0000 (15:15 +0200)]
ifdef, not if

6 years agoInstance variable work.
Bart House [Fri, 23 Nov 2018 13:13:06 +0000 (05:13 -0800)]
Instance variable work.

6 years agoInstance variable work check-point.
Bart House [Fri, 23 Nov 2018 12:49:51 +0000 (04:49 -0800)]
Instance variable work check-point.

6 years agoMerge branch 'win-bart' of https://rodney.nethack.org:20040/git/NHsource into win...
Bart House [Fri, 23 Nov 2018 06:19:47 +0000 (22:19 -0800)]
Merge branch 'win-bart' of https://rodney.nethack.org:20040/git/NHsource into win-bart

6 years agoInitial check in of icontext work.
Bart House [Thu, 22 Nov 2018 18:15:43 +0000 (10:15 -0800)]
Initial check in of icontext work.

6 years agoMerge branch 'win-bart' of https://rodney.nethack.org:20040/git/NHsource into win...
Bart House [Fri, 23 Nov 2018 06:07:22 +0000 (22:07 -0800)]
Merge branch 'win-bart' of https://rodney.nethack.org:20040/git/NHsource into win-bart

6 years agoFixed nocreate.
Bart House [Fri, 23 Nov 2018 05:40:15 +0000 (21:40 -0800)]
Fixed nocreate.

6 years agoFixed nocreate.
Bart House [Fri, 23 Nov 2018 05:55:03 +0000 (21:55 -0800)]
Fixed nocreate.

6 years agocheck.
Bart House [Fri, 23 Nov 2018 05:40:15 +0000 (21:40 -0800)]
check.

6 years agoMerge branch 'win-bart' of https://rodney.nethack.org:20040/git/NHsource into win...
Bart House [Fri, 23 Nov 2018 05:39:57 +0000 (21:39 -0800)]
Merge branch 'win-bart' of https://rodney.nethack.org:20040/git/NHsource into win-bart

6 years agoInitial check-in of icontext work.
Bart House [Thu, 22 Nov 2018 21:01:58 +0000 (13:01 -0800)]
Initial check-in of icontext work.

6 years agoInitial check in of icontext.
Bart House [Fri, 23 Nov 2018 04:47:22 +0000 (20:47 -0800)]
Initial check in of icontext.

6 years agoMoved petname_used to decl.c
Bart House [Thu, 22 Nov 2018 23:49:43 +0000 (15:49 -0800)]
Moved petname_used to decl.c

6 years agoPrevious encumberance state moved to decl.c.
Bart House [Thu, 22 Nov 2018 23:40:31 +0000 (15:40 -0800)]
Previous encumberance state moved to decl.c.

6 years agoAdded decl_early_init() which is called when PLAYAGAIN is supported.
Bart House [Thu, 22 Nov 2018 23:20:17 +0000 (15:20 -0800)]
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.

6 years agoAdded nhassert() support.
Bart House [Thu, 22 Nov 2018 23:03:26 +0000 (15:03 -0800)]
Added nhassert() support.

6 years agoAdded nhassert() support to tile2bmp.
Bart House [Thu, 22 Nov 2018 23:03:00 +0000 (15:03 -0800)]
Added nhassert() support to tile2bmp.

6 years agoRevert "Modified how we initialize save file info."
Bart House [Thu, 22 Nov 2018 22:21:31 +0000 (14:21 -0800)]
Revert "Modified how we initialize save file info."

This reverts commit 250ca464bc2aa5ec565b73c2cbaf9308c8592a70.

6 years agoAdded PLAYAGAIN experimental support definition.
Bart House [Thu, 22 Nov 2018 21:05:44 +0000 (13:05 -0800)]
Added PLAYAGAIN experimental support definition.

6 years agoModified how we initialize save file info.
Bart House [Thu, 22 Nov 2018 21:01:58 +0000 (13:01 -0800)]
Modified how we initialize save file info.

There should be no net change other then improving code maintenance.

6 years agoRemoved unnecessary use of static for nocreate values.
Bart House [Thu, 22 Nov 2018 18:15:43 +0000 (10:15 -0800)]
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.

6 years agoFix guard shoving monsters away coordinate logic
Pasi Kallinen [Thu, 22 Nov 2018 18:24:56 +0000 (20:24 +0200)]
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.

6 years agofix #H7585 - can't untrap from edge of pit
PatR [Thu, 22 Nov 2018 03:16:23 +0000 (19:16 -0800)]
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.

6 years agomore Schroedinger's Cat
PatR [Thu, 22 Nov 2018 02:32:04 +0000 (18:32 -0800)]
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.

6 years agovmsbuild.com update
PatR [Thu, 22 Nov 2018 00:47:42 +0000 (16:47 -0800)]
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.

6 years agofuzzer fixes on windows for testing
nhmall [Wed, 21 Nov 2018 23:50:02 +0000 (18:50 -0500)]
fuzzer fixes on windows for testing

6 years agoMap column 0 is not a valid location
Pasi Kallinen [Wed, 21 Nov 2018 17:17:08 +0000 (19:17 +0200)]
Map column 0 is not a valid location

6 years agoSchroedinger's Cat
PatR [Wed, 21 Nov 2018 11:10:49 +0000 (03:10 -0800)]
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.

6 years agoMerge branch 'macosx-curses-fall2018' into NetHack-3.6.2-beta01
nhmall [Wed, 21 Nov 2018 02:01:48 +0000 (21:01 -0500)]
Merge branch 'macosx-curses-fall2018' into NetHack-3.6.2-beta01

6 years agofixes updates for curses and Xcode
nhmall [Wed, 21 Nov 2018 02:00:03 +0000 (21:00 -0500)]
fixes updates for curses and Xcode

6 years agosentence spacing
PatR [Wed, 21 Nov 2018 01:56:16 +0000 (17:56 -0800)]
sentence spacing

Use two spaces between sentences.  This only fixes the instances of
one-space that were fairly easy to find.

6 years agosuppress compiler warning differently
nhmall [Wed, 21 Nov 2018 01:30:44 +0000 (20:30 -0500)]
suppress compiler warning differently

6 years agoMerge branch 'macosx-curses-fall2018' of https://rodney.nethack.org:20040/git/NHsourc...
Bart House [Wed, 21 Nov 2018 00:11:42 +0000 (16:11 -0800)]
Merge branch 'macosx-curses-fall2018' of https://rodney.nethack.org:20040/git/NHsource into macosx-curses-fall2018

6 years agoSwitching back to tty on picked by default for XCode biuld.
Bart House [Wed, 21 Nov 2018 00:11:22 +0000 (16:11 -0800)]
Switching back to tty on picked by default for XCode biuld.

6 years agofollow-up bits
nhmall [Wed, 21 Nov 2018 00:09:05 +0000 (19:09 -0500)]
follow-up bits