Commit Graph

7696 Commits

Author SHA1 Message Date
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
Bart House
bf549e865f Added project wide build settings for nethack directories. 2018-11-19 12:03:02 -08:00
Pasi Kallinen
b0428321b8 Explicitly remove long worm segments from the map
When a long worm was removed from the map, the segments for that worm
retained their map location info. This caused problems later on if
wormgone (or toss_wsegs) was called, because it would try to remove the
segments of that worm from the map.
2018-11-19 21:54:35 +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
898a22159f Added building of data to xcode build. 2018-11-19 11:33:11 -08:00
Pasi Kallinen
7119baafb8 Long worm may get killed in middle of action
If long worm attacks you, and you have a passive response that may
kill the worm (eg. blue jelly), the worm may die in the middle of
a loop checking for a worm segment that can attack. This'll cause
a segfault because the worm segments will get freed.

If the worm dies, just exit the loop.
2018-11-19 21:27:26 +02:00
Pasi Kallinen
9ad7268c0a Moving long worms may still put tail in old location
When using rloc and friends to move monsters, and the monster
happens to be a long worm, the tail may get randomly placed
in the same place where the long worm was removed from.

In the cases where we expect the location to really be free,
explicitly recheck the location for a monster after rloc.
2018-11-19 21:24:11 +02:00
Pasi Kallinen
657f557821 Fix vault guard not considering monsters in walls
Two different cases here: a) Vault guard did not move away monsters
except if they were standing on gold, and b) moving away monsters
on a completely filled level did not work
2018-11-19 21:20:43 +02:00
Pasi Kallinen
ebef31ffa5 Check monster relocation degenerate cases more strictly
Just in case we're trying to put the monster on the same location
where it already thinks it is... but actually isn't.
2018-11-19 21:16:50 +02:00
Pasi Kallinen
878ac24037 Fix freeing monsters not on map
Sometimes we free the monster data, but the monster is not on the
map - usually this happens if the map is full of monsters and a new one
is migrated on the level.

Make m_detach check the monster x coordinate, so it knows not to touch the map
if the monster isn't on it.
2018-11-19 21:16:46 +02:00
Bart House
4788b10d88 XCode project check-point. 2018-11-19 11:06:57 -08:00
Bart House
3c5556d45e Fix vi induced build problem. 2018-11-19 09:53:46 -08:00
Bart House
16d5631235 Merge branch 'macosx-curses-fall2018' of https://rodney.nethack.org:20040/git/NHsource into macosx-curses-fall2018 2018-11-19 09:22:32 -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
7ee4fa3c3f some curses window-port doc bits 2018-11-19 10:40:51 -05:00
nhmall
a4eb3df5f0 Merge branch 'NetHack-3.6.2-beta01' into macosx-curses-fall2018 2018-11-19 09:58:40 -05:00
nhmall
923e1c5854 Merge branch 'NetHack-3.6.2-beta01' into win-curses 2018-11-19 09:57:58 -05:00
nhmall
a58571a475 .gitignore update 2018-11-18 23:53:49 -05:00
PatR
40ce977522 fix #H7573 - impossible zero payment in money2mon
When paying for shop door or wall damage, if the entire amount was
covered by shop credit then impossible "zero payment in money2mon"
would occur as the shop code tried to transfer 0 zorkmids from hero
to shopkeeper after using credit to pay.
2018-11-18 18:48:59 -08:00
nhmall
9958fda6b5 Merge branch 'NetHack-3.6.2-beta01' into win-curses 2018-11-18 14:58:31 -05:00
Bart House
360ee21861 Revert "Hint file for macOS X with curses."
This reverts commit f7fbbb8cb0.
2018-11-18 11:45:36 -08:00
Bart House
444d1ec50a Merge branch 'win-curses' of https://rodney.nethack.org:20040/git/NHsource into win-curses 2018-11-18 09:30:11 -08:00
Bart House
f7fbbb8cb0 Hint file for macOS X with curses. 2018-11-18 09:28:45 -08:00
nhmall
15da3e4d53 Merge branch 'win-curses' into macosx-curses-fall2018 2018-11-18 09:10:26 -05:00
nhmall
bc8be48a92 quiet some mismatched prototype warnings with visual studio compiler
pager.c
.\pager.c(1886): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1887): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1888): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1889): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1890): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1891): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1893): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1895): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1896): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1897): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1898): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1902): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1921): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
2018-11-18 08:45:32 -05:00
nhmall
60c3c2f113 fix a build error when curses is NOT enabled
Fix an error when curses build macros are not defined
makefile(1262) : fatal error U1083: target macro '$(PDCLIB)' expands to nothing
2018-11-18 08:34:24 -05:00
nhmall
1b36af5d8a update Install.nt 2018-11-18 07:59:59 -05:00
nhmall
bf0e0b9f12 Makefile cut-and-paste error 2018-11-18 07:10:58 -05:00
nhmall
935fe5bca8 Makefile macro correction 2018-11-18 06:57:17 -05:00
nhmall
bbe7029e77 more curses Makfile mods 2018-11-18 06:48:47 -05:00
nhmall
9c4de50c9a windows VS Makefile with curses and PDCurses 2018-11-18 06:24:32 -05:00
nhmall
312f492149 Merge branch 'win-minor' into win-curses 2018-11-18 04:32:28 -05:00
Bart House
6ba270563c Build curses if PDCurses is available.
There are two ways to enable curses in the build.  Either set the
environment variable PDCURSES to a folder containing a PDCurses repository
OR place the PDCurses folder alongside the NetHack source repository.
2018-11-17 23:56:31 -08:00