Commit Graph

1427 Commits

Author SHA1 Message Date
nhmall
6f3f1caee3 Revert "define nhassert if not defined by port."
This reverts commit cff9fb441a.
2018-11-23 22:16:52 -05:00
nhmall
9db124f650 Revert "Fix compiler warnings in macos build."
This reverts commit 0d59f1a22b.
2018-11-23 22:16:49 -05:00
nhmall
7f023c99fb Revert "Moved sex_change_ok to instance_globals."
This reverts commit ee22210a68.
2018-11-23 22:16:47 -05:00
nhmall
44af1c78f3 Revert "topl.c globals moved to instance_globals."
This reverts commit b384223e1b.
2018-11-23 22:16:45 -05:00
nhmall
61a35d4ac0 Revert "Moved pickup globals to instance_globals."
This reverts commit 01596f1660.
2018-11-23 22:16:40 -05:00
nhmall
734a6c2ddb Revert "objnam.c globals moved to instance globals."
This reverts commit 041e55467a.
2018-11-23 22:16:35 -05:00
nhmall
3cbc6d4cf5 Revert "Modified objects initialization to support re-entry."
This reverts commit c3eefefc99.
2018-11-23 22:16:24 -05:00
nhmall
efdfd2fa1d Revert "Removing prototype for decl_globals_init()."
This reverts commit 26d03b5017.
2018-11-23 22:15:37 -05:00
Bart House
26d03b5017 Removing prototype for decl_globals_init(). 2018-11-23 15:47:18 -08:00
Bart House
c3eefefc99 Modified objects initialization to support re-entry. 2018-11-23 15:22:55 -08:00
Bart House
041e55467a objnam.c globals moved to instance globals. 2018-11-23 15:22:55 -08:00
Bart House
01596f1660 Moved pickup globals to instance_globals. 2018-11-23 15:22:55 -08:00
Bart House
b384223e1b topl.c globals moved to instance_globals. 2018-11-23 15:22:54 -08:00
Bart House
ee22210a68 Moved sex_change_ok to instance_globals. 2018-11-23 15:22:54 -08:00
Bart House
0d59f1a22b Fix compiler warnings in macos build. 2018-11-23 15:22:54 -08:00
Bart House
cff9fb441a define nhassert if not defined by port. 2018-11-23 15:22:54 -08:00
Bart House
d3c192e5a8 Moved potion.c globals to instance_globals. 2018-11-23 15:22:54 -08:00
Bart House
d37a91a6b8 Moved read.c globals to instance_globals. 2018-11-23 15:22:54 -08:00
Bart House
865c4d5a7d restore.c globals moved to instance_globals. 2018-11-23 15:22:54 -08:00
Bart House
cee4933c24 Renamed UNDEFINED to UNDEFINED_VALUE. 2018-11-23 15:22:54 -08:00
Bart House
716c2ceccf rfilter initialized to UNDEFINED. 2018-11-23 15:22:54 -08:00
Bart House
6a78b203e4 rumors.c static globals moved to instance_globals. 2018-11-23 15:22:53 -08:00
Bart House
f9a0db6c44 Renamed instance_variables to global_variables and iv to g. 2018-11-23 15:22:53 -08:00
Bart House
14bf74c862 Instance variable work. 2018-11-23 15:22:53 -08:00
Bart House
8e316df117 Instance variable work check-point. 2018-11-23 15:22:53 -08:00
Bart House
244a473a19 Fixed nocreate. 2018-11-23 15:22:52 -08:00
Bart House
7814d9097a check. 2018-11-23 15:22:52 -08:00
Bart House
5bbe3cd6bb Initial check in of icontext. 2018-11-23 15:22:51 -08:00
Bart House
6272c37035 Moved petname_used to decl.c 2018-11-23 15:22:51 -08:00
Bart House
4e774197a6 Previous encumberance state moved to decl.c. 2018-11-23 15:22:51 -08:00
Bart House
acbe4d9242 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-23 15:22:51 -08:00
Bart House
05c9ccc035 Revert "Modified how we initialize save file info."
This reverts commit 250ca464bc.
2018-11-23 15:22:51 -08:00
Bart House
ea8cf6613a Added PLAYAGAIN experimental support definition. 2018-11-23 15:22:51 -08:00
Bart House
44b002c9f3 Modified how we initialize save file info.
There should be no net change other then improving code maintenance.
2018-11-23 15:22:50 -08:00
Pasi Kallinen
3517277467 Add some commented out flags to linux hints file 2018-11-23 19:26:13 +02:00
Pasi Kallinen
80d1aae8a5 ifdef, not if 2018-11-23 15:15:04 +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
b4be8852a4 suppress compiler warning differently 2018-11-20 20:30:44 -05:00
nhmall
4228cf534e follow-up bits 2018-11-20 19:09:05 -05:00
Bart House
8799f05904 Fix lrand48 and srand48 declarations. 2018-11-20 10:26:09 -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
Pasi Kallinen
2a439af336 More long worm checks when splitting
When a long worm is split into two, perform more checks placing
the segments on the map.
2018-11-19 21:49:52 +02:00
Bart House
3c5556d45e Fix vi induced build problem. 2018-11-19 09:53:46 -08:00
Bart House
aa48ed18e7 Initial check-in of work in progress xcode build of NetHack.
Buyer beware.  This is a check-point of the xcode work to allow others
to play.
2018-11-19 09:22:11 -08:00
nhmall
113d5cdb26 missed include/wincurs.h 2018-11-16 21:00:11 -05:00
nhmall
cb43061076 curses changes to existing files 2018-11-16 20:51:22 -05:00
nhmall
96ec49213f Add some windows command line option hooks 2018-11-16 19:32:00 -05:00
nhmall
16e014b39f Merge branch 'win-minor' into NetHack-3.6.2-beta01 2018-11-12 23:15:13 -05:00
Bart House
3bb759a9ab Started work to support per monitor DPI. Using DPI to scale tiles
appropriately.

Renamed ntassert to nhassert.  (Naming mistake caused by using ntassert
at work).

Re-ordered a few more includes to get window headers included before
nethack headers.
2018-11-12 17:45:22 -08:00