Commit Graph

4850 Commits

Author SHA1 Message Date
Pasi Kallinen
612852f7de Apply paxed's DEBUG patch to remove DEBUG/D_DEBUG.
Move debugging output into couple preprocessor defines, which
    are no-op without DEBUG.  To show debugging output from a
    certain source files, use sysconf:

    DEBUGFILES=dungeon.c questpgr.c

    Also fix couple debug lines which did not compile.

This also includes fixes due to Derek Ray to depugpline to work better
on other platforms.
2015-02-27 19:33:45 -05:00
Sean Hunt
ac108cd365 Make GOLDOBJ unconditional. 2015-02-27 19:33:40 -05:00
Sean Hunt
4f59f5c6fd Make WIZARD unconditional. 2015-02-27 19:33:22 -05:00
Sean Hunt
ad82ca80f3 Make DUNGEON_OVERVIEW unconditional. 2015-02-27 19:33:20 -05:00
Sean Hunt
1edadd1d48 Make REINCARNATION unconditional.
There is a lot of code affected by this, and Pat Rankin correctly
observes that it would be better to store roguelike as a level flag
rather than just using Is_rogue_level. A note for the future.
2015-02-27 19:33:16 -05:00
Sean Hunt
260f7ea860 Make TOURIST unconditional. 2015-02-27 19:33:12 -05:00
Sean Hunt
5ee71d2757 Make SINKS unconditional. 2015-02-27 19:33:06 -05:00
Sean Hunt
b066b7c170 Make KOPS unconditional. 2015-02-27 19:33:04 -05:00
Sean Hunt
9e65758947 Make STEED unconditional. 2015-02-27 19:33:01 -05:00
Sean Hunt
264dc66129 Make ELBERETH unconditional. 2015-02-27 19:32:53 -05:00
Derek S. Ray
7f0ff8f011 Make nhsetup smart enough to see VC2013, VC2010
Only detects Express editions for now until I can verify
what registry keys correspond to each set of full editions.
2015-02-27 18:14:10 -05:00
Derek S. Ray
f15a640120 remove old projects from root win/win32 directory 2015-02-27 16:06:47 -05:00
Derek S. Ray
2f8d6502fd Initial changes to support both VS2010 and VS2013
Mostly it's just project formats, but VS2013 does require
parallel compilation to be turned off and synchronous
PDB writes to be turned on (since we reuse intermediate
output directories).

Cleaning that up is for some time in the future.
2015-02-27 16:00:58 -05:00
nhmall
e400723863 undo a set of code reverts in last commit 2015-02-26 22:48:32 -05:00
nhmall
e1dfe9c48a Roll back the win/win32 tree to the way it was before x64 attempt 2015-02-26 22:09:31 -05:00
Derek S. Ray
18ca81d963 token .gitignore change to differentiate branch 2015-02-26 21:57:47 -05:00
keni
7d9ea49e92 Another batch of manual header var additions 2015-02-26 17:43:47 -05:00
keni
0109f9715b A batch of manual header var additions. 2015-02-26 17:10:11 -05:00
keni
b598c83767 Update .gitignore files. 2015-02-26 16:35:55 -05:00
keni
971ff1d4f3 Fix lost mode bits. 2015-02-26 09:22:52 -05:00
keni
03140969ee Bulk recovery of file CVS headers and addition of NHDT- headers. 2015-02-26 09:19:03 -05:00
keni
9480f880c4 Add .gitattribute files. 2015-02-26 08:54:12 -05:00
Pasi Kallinen
ce0665cd15 Add a missing break
Stepping on a magic trap while riding could delete the trap and
make the deleted trap hit the steed.
2015-02-20 20:26:46 +02:00
Sean Hunt
0d9ae1d293 Add fixes notes for the recent lava changes. 2015-02-20 12:59:45 -05:00
Sean Hunt
a3b1cb8432 Remove the 'nul' variable. 2015-02-18 23:51:31 -05:00
Sean Hunt
72c2ae233d Clean up lava messages a little.
This change has two parts.

First, the Book of the Dead now has a special message in lava. This was
originally added by Steve Melenchuk (aka Grunt) as a precaution against the Book
burning up. While I'm pretty sure that the Book can't burn up in the current
codepath, the message is a nice touch and it doesn't help to add a safety check.

Second, always print the inventory destruction messages. The reason for this is
fairly subtle, but relates to the timing. By not printing the messages when
dying, the visible effect to the player is that if they have lifesaving, the
items burn up before they die, but if they do not, they burn up after they
die---the fact that they do burn up is visible in the dump or bonesfile.
2015-02-18 23:24:41 -05:00
Sean Hunt
ad4f3fc0fe Clean up the lava code a little. 2015-02-18 23:19:23 -05:00
Sean Hunt
d34bc6fd73 Destroy water walking boots on lava first.
This avoids a player being left standing on lava if their boots are burned up and
they survive the damage.

This change is originally due to Steve Melenchuk, fixed up by Derrick Sund.
2015-02-18 23:05:37 -05:00
Sean Hunt
ca6bbf8bc3 Fix warning with verbalize1 2015-02-18 21:48:34 -05:00
Pasi Kallinen
2bf54fd893 Fix the X11 hints file. 2015-02-17 16:54:38 +02:00
keni
bbfb2a4623 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-02-16 08:58:20 -05:00
keni
5dda2afd32 Fix bug: NHtext adds a space to a substitution value.
Add support for debugging from the command line.
2015-02-16 08:53:52 -05:00
Sean Hunt
7e93cadc1c Replace && with & in blindness timeout check.
Caught by clang.
2015-02-16 00:24:05 -05:00
Sean Hunt
862d32c2ec Fix a few compiler (clang) warnings. 2015-02-16 00:23:48 -05:00
Derek S. Ray
d34bab1509 more win32-specific pieces 2015-02-15 14:45:36 -05:00
keni
3266234ecc Convert mdgrep from cvs to git. 2015-02-13 20:32:09 -05:00
keni
b7ea921ea0 Set up mdgrep for git instead of cvs. 2015-02-13 17:54:15 -05:00
keni
aed830f493 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-02-13 17:37:36 -05:00
keni
b87b568f72 Typo 2015-02-13 17:37:06 -05:00
Pasi Kallinen
a55bef240c Typofix. 2015-02-13 22:32:33 +02:00
Derek
f5089838c1 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-02-13 13:29:23 -05:00
Derek
bae3c6088f Exclude all the Win32 build artifacts (Studio and otherwise)
Squashed commit of the following:

commit e37c7626f035a29321c9ac12cca83a0af2132abb
commit 86ebb3e66aedb6b5a31d61d57c39cf84c12d2276
commit 6cd677c8fca4102f223fb1708d00a65c2ded6658
Author: Derek <derekray@gmail.com>
Date:   Fri Feb 13 13:24:29 2015 -0500
2015-02-13 13:26:05 -05:00
keni
b312870522 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-02-13 11:54:28 -05:00
keni
8c7b6cd110 add another note about executable scripts 2015-02-13 11:54:04 -05:00
keni
5404e9d253 add note about making PRE file executable 2015-02-13 11:52:29 -05:00
Sean Hunt
967364b6ed +x .sh files in unix dir; ignore Makefiles 2015-02-13 11:39:37 -05:00
keni
b3c8089e55 .git* cleanup tids 2015-02-12 16:39:51 -05:00
keni
a0315f3f34 add DEVEL to the directory list 2015-02-11 20:24:14 -05:00
keni
34221670bc initial git setup 2015-02-11 19:42:57 -05:00
nethack.rankin
5cc7f32044 retouch_equipment() bypass handling
Simplify retouch_equipment (post-3.4.3.code, called when hero
changes alignment or turns into a silver-hating critter; inventory
traversal must cope with the possibility of losing object->nobj when
processing object) by switching to recently added object->bypass code.
2013-11-07 01:03:16 +00:00