Commit Graph

4157 Commits

Author SHA1 Message Date
nhmall
4da05c9dba catch up fixes with some recent changes; also add 'community patch' section 2015-03-17 18:46:54 +02:00
Pasi Kallinen
d67ffd179a Remove useless dungeon.def mangling 2015-03-17 18:46:54 +02:00
Pasi Kallinen
a156f98de0 Remove mention of compile-time AUTOPICKUP_EXCEPTIONS 2015-03-17 18:46:53 +02:00
Pasi Kallinen
f56b880e0a Remove last mention of EXP_ON_BOTL 2015-03-17 18:46:53 +02:00
Pasi Kallinen
1b25fe74d8 Remove last mention of DUNGEON_OVERVIEW 2015-03-17 18:46:53 +02:00
keni
5b4000a2e9 Change NHtext to double the speed of "git checkout" 2015-03-17 18:46:53 +02:00
Pasi Kallinen
56279a9950 Add new parameters to makedefs: --debug and --make
"makedefs --debug --make q" is equivalent to "makedefs -q" with
DEBUG defined.
2015-03-17 18:46:52 +02:00
Derek S. Ray
66289b13ab remove and transfer INVISIBLE_OBJECTS to branch 2015-03-17 18:46:49 +02:00
Derek S. Ray
8fa8e02415 Remove unused size from questpgr.c 2015-03-17 18:46:48 +02:00
Sean Hunt
07da4a740e Fix some warnings on the unconditionals branch. 2015-03-17 18:46:48 +02:00
Sean Hunt
5fb3fea9c6 Remove experimental Unicode support.
This reverts commit 7f0f43e6f9 and some related
subsequent commits.

This compiles, but I have not done extensive testing.

Conflicts:
	include/config.h
	include/decl.h
	include/extern.h
	include/global.h
	include/tradstdc.h
	include/wintty.h
	src/drawing.c
	src/files.c
	src/hacklib.c
	src/mapglyph.c
	src/options.c
	sys/winnt/nttty.c
	win/tty/getline.c
	win/tty/topl.c
	win/tty/wintty.c
2015-03-17 18:46:45 +02:00
Sean Hunt
fb46fed99d Make EXP_ON_BOTL unconditional. 2015-03-17 18:46:44 +02:00
Sean Hunt
f27d319e68 Make REDO unconditional. 2015-03-17 18:46:41 +02:00
Sean Hunt
11d11c5de3 Make LOADSYMSETS unconditional.
There are some bugs here, but this functionality should make it into the release
in some form.
2015-03-17 18:46:39 +02:00
Sean Hunt
3481ec6589 Make AUTOPICKUP_EXCEPTIONS unconditional. 2015-03-17 18:46:37 +02:00
Sean Hunt
8798197d85 Make BARGETHROUGH unconditional. 2015-03-17 18:46:35 +02:00
Sean Hunt
dcc2f8ba93 Make SEDUCE unconditional. 2015-03-17 18:46:32 +02:00
Pasi Kallinen
099a1b7b32 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-03-17 18:46:27 +02:00
Sean Hunt
05f7a63728 Make GOLDOBJ unconditional. 2015-03-17 18:46:23 +02:00
Sean Hunt
cc7ab4a2da Make WIZARD unconditional. 2015-03-17 18:46:17 +02:00
Sean Hunt
eca41ae060 Make DUNGEON_OVERVIEW unconditional. 2015-03-17 18:46:12 +02:00
Sean Hunt
ffd201495c 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-03-17 18:46:08 +02:00
Sean Hunt
bb647dc33c Make TOURIST unconditional. 2015-03-17 18:46:01 +02:00
Sean Hunt
44ca9fc16a Make SINKS unconditional. 2015-03-17 18:45:58 +02:00
Sean Hunt
161070ce56 Make KOPS unconditional. 2015-03-17 18:45:56 +02:00
Sean Hunt
9759f5bf6d Make STEED unconditional. 2015-03-17 18:45:49 +02:00
Sean Hunt
aba6ecb7b3 Make ELBERETH unconditional. 2015-03-17 18:45:45 +02:00
keni
69356cc77d Another batch of manual header var additions 2015-03-17 18:45:43 +02:00
keni
4e50ba93f4 A batch of manual header var additions. 2015-03-17 18:45:42 +02:00
keni
414aea7517 Update .gitignore files. 2015-03-17 18:45:42 +02:00
keni
28a53d5081 Fix lost mode bits. 2015-03-17 18:45:40 +02:00
keni
25cd007c48 Bulk recovery of file CVS headers and addition of NHDT- headers. 2015-03-17 18:45:12 +02:00
keni
55a9ad84de Add .gitattribute files. 2015-03-17 18:44:59 +02:00
Pasi Kallinen
98785f5d44 Add a missing break
Stepping on a magic trap while riding could delete the trap and
make the deleted trap hit the steed.
2015-03-17 18:44:58 +02:00
Sean Hunt
b777aff284 Add fixes notes for the recent lava changes. 2015-03-17 18:44:58 +02:00
Sean Hunt
0fcd4c0093 Remove the 'nul' variable. 2015-03-17 18:44:58 +02:00
Sean Hunt
38964dc56c 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-03-17 18:44:57 +02:00
Sean Hunt
c6628bcbff Clean up the lava code a little. 2015-03-17 18:44:56 +02:00
Sean Hunt
9644ec781a 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-03-17 18:44:56 +02:00
Sean Hunt
e95bd8ec5b Fix warning with verbalize1 2015-03-17 18:44:56 +02:00
Pasi Kallinen
b6ccaf3d54 Fix the X11 hints file. 2015-03-17 18:44:55 +02:00
Sean Hunt
07cf4e9657 Replace && with & in blindness timeout check.
Caught by clang.
2015-03-17 18:44:55 +02:00
Sean Hunt
01756b33fa Fix a few compiler (clang) warnings. 2015-03-17 18:44:54 +02:00
Derek S. Ray
e1e55c31c7 more win32-specific pieces 2015-03-17 18:44:54 +02:00
keni
9554626288 Fix bug: NHtext adds a space to a substitution value.
Add support for debugging from the command line.
2015-03-17 18:44:54 +02:00
keni
485173626a Convert mdgrep from cvs to git. 2015-03-17 18:44:54 +02:00
keni
8ac52b247a Set up mdgrep for git instead of cvs. 2015-03-17 18:44:53 +02:00
Pasi Kallinen
793c8577b9 Typofix. 2015-03-17 18:44:53 +02:00
Derek
4c496d089e 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-03-17 18:44:53 +02:00
keni
041045a890 Typo 2015-03-17 18:44:53 +02:00