Commit Graph

6292 Commits

Author SHA1 Message Date
keni
ea8d4ae301 Merge remote-tracking branch 'origin/NetHack-3.6.0' 2016-12-26 18:43:18 -05:00
Pasi Kallinen
1a1adfee3e Fix valgrind complaint in wizmode terrain
The code was writing characters into row[x-1] in the loop, but putting the
string terminator at row[x], leaving one character between uninitialized.
2016-12-23 13:34:10 +02:00
PatR
d606b2a8ff tty's compress_str(), core's dat/keyhelp
Rewrite 3.6.1's compress_str() to avoid peeking past the end of the
input string.  This should eliminate the reported valgrind complaint.
The problem was noticed for post-3.6.0 code introduced [by me...] last
June, but it looks like it was present in the old code too.

Also, fix the wording in the paragraph about NUL in the keyhelp text.

tty_putstr() always passes non-message window text through compress_str(),
clobbering usage of two spaces to separate sentences.  putstr()'s caller
ought to have more control over that (possibly via its hardly ever used
'attribute' arg?).
2016-12-20 12:43:35 -08:00
Pasi Kallinen
f4632732ac Fix wishing for tins of specific type
I believe this bug already existed, but was only exposed by
my wishing parser change post-3.6.0
2016-12-14 18:28:01 +02:00
Pasi Kallinen
f3b1cc74c6 Set max players in sysconf, not in the shell script 2016-12-14 16:49:52 +02:00
Pasi Kallinen
86df94b281 Impossible instead of segfault in cursed
While fuzz testing, I've seen segfault a handful of times in here,
coming from do_takeoff(). Looks like context.takeoff.what is stale,
having WORN_BLINDF, but we're not wearing the blindfold anymore.

Haven't been able to trace it down yet, so guard it with impossible.
2016-12-12 17:42:06 +02:00
keni
39fb35f9ce Merge remote-tracking branch 'origin/NetHack-3.6.0' 2016-12-09 17:47:54 -05:00
PatR
2655910a0f fix #H4597 - sitting on level teleport trap
During #sit:  "You sit down.  You step on a level teleporter."
Switch to alternate phrasing for #sit.

Webs and polymorph traps had similar issues.
2016-12-08 17:22:59 -08:00
PatR
9b725218bb fix #H4706 - non-zero hit points for poison death
For "the poison was deadly" against hero, hit points were set to -1
(which gets displayed as 0 when shown) but the status lines weren't
being updated, so stale positive HP value was visible during final
disclosure.
2016-12-08 16:39:55 -08:00
PatR
66a0c98954 fix some recent lint 2016-12-08 16:01:09 -08:00
Pasi Kallinen
97ffc0f53d Fix segfault when attacked while polyed into disenchanter
The pointer keeping tabs of monster's current weapon was
not cleared.

How to trigger: Get hit by a monster wielding a weapon,
teleport to another level, poly into disenchanter, get hit
by any monster with AD_PHYS attack and not wielding any weapon.
2016-12-07 20:23:17 +02:00
Pasi Kallinen
b8d8556eff Fix some issues found with fuzz testing
Mostly to do with relocating monsters when the level is already full,
and unsticking a monster if it gets relocated.
2016-12-07 17:53:08 +02:00
Pasi Kallinen
daff7653f8 Add missing symbols to Blank symset and Guidebook 2016-12-04 21:38:59 +02:00
Pasi Kallinen
5da34b7db6 Fix segfault when looking at detected monster hiding under unknown armor
This segfault happened when a detected monster such as a garter snake was
hiding under an unknown/unseen armor of a type that has no description
field (eg. a leather armor), and you farlooked at the monster.

At the same time, simplifies the code a tiny bit.
2016-12-02 22:12:44 +02:00
Alex Smith
52457be911 Merge branch 'ais523-movespeed' into NetHack-3.6.0 2016-12-02 17:10:37 +00:00
Pasi Kallinen
b0c68714ce Make Ogresmasher grant 25 constitution 2016-11-14 20:22:33 +02:00
Pasi Kallinen
06bd0d426b Make Dragonbane confer reflection when wielded 2016-11-14 19:34:20 +02:00
keni
cd63f73062 Merge remote-tracking branch 'origin/NetHack-3.6.0' 2016-11-13 15:23:28 -05:00
Pasi Kallinen
84dc214e5c Fix wrong material for novels
HI_PAPER is color, PAPER is material - the novel object definition
was using the wrong one. The caused the novel material to be gold.
2016-11-13 15:25:43 +02:00
Alex Smith
ec2beee61f Changelog for movement speed changes 2016-11-12 01:28:47 +00:00
Alex Smith
11625c0772 Make free actions easier to predict, nonfree actions more predictable
This fixes melee kiting more comprehensively (it now doesn't work
against slower monsters either), and prevents you doing things like
opening up a gap when running from an imp (you couldn't do that in
3.4.3).
2016-11-12 01:24:03 +00:00
Pasi Kallinen
897916f921 Sanity check for returning Mjollnir animation 2016-11-11 18:18:55 +02:00
keni
c08c73c738 fix nested comment warning 2016-11-09 20:10:42 -05:00
keni
9cdbf3bcce Merge remote-tracking branch 'origin/NetHack-3.6.0' 2016-11-04 16:46:19 -04:00
keni
c5133e4f99 Explicit verbiage for BREAK_360_SAVE_COMPAT. 2016-10-29 11:50:58 -04:00
Pasi Kallinen
f4acfd7995 Make older corpses not taste okay
Post-3.6.0 change made practically all corpses taste okay.
Change it so there's always a 10% chance for the corpse
to taste terrible, and increase the chance if the corpse
is slightly old.
2016-10-27 21:44:44 +03:00
keni
355bc8e601 Explain (via preprocessor defines) why CONWAY is off at the moment. 2016-10-26 09:42:19 -04:00
keni
0724fe98cf Merge remote-tracking branch 'origin/NetHack-3.6.0' 2016-10-23 15:21:59 -04:00
Alex Smith
f715224b9c Merge branch 'ais523-elbereth' into NetHack-3.6.0 2016-10-21 23:30:09 +01:00
Pasi Kallinen
bf1c81c0b4 Accept custom level annotations at the level teleport prompt
via UnNetHack, original implementation by aaxelb
2016-10-18 23:19:16 +03:00
Pasi Kallinen
1506572ea0 With fragile wands, use snap instead of break 2016-10-18 19:42:20 +03:00
Alex Smith
9c5cfc4153 Changelog for the Elbereth changes 2016-10-18 16:52:30 +01:00
Pasi Kallinen
f106b578a2 Wielding Demonbane prevents demons summoning friends 2016-10-18 18:07:53 +03:00
Alex Smith
d01c0364f1 Ugh, why does NH3's commit process have to differ from NH4's? 2016-10-17 18:29:09 +01:00
Alex Smith
348e54aa32 Change the rules for Elbereth erosion
If you attack a monster under Elbereth protection, and it wasn't
scuffed by the attack itself, then it'll be automatically removed
with an alignment penalty. It no longer fades from scaring monsters;
only from being abused to attack monsters while protected.
2016-10-17 18:26:44 +01:00
Alex Smith
ee5b488514 Differentiate between monster anger from attacks and from other causes
setmangry() and wakeup() were being used for multiple purposes. Add an
extra parameter to track which. This fixes several minor bugs (e.g.
whether monsters with no eyes were angered by (useless) gaze attacks
against them previously depended on the state of a UI option, and
the Minetown guards would be annoyed if you used a cursed scroll of
tame monster on a shopkeeper). It's also a prerequisite for the
Elbereth changes I'm working on.
2016-10-17 18:19:22 +01:00
Alex Smith
5c12362a98 Fix engrave.c; I used the wrong commit command 2016-10-17 17:34:08 +01:00
Alex Smith
8d32f37588 Make the Elbereth restrictions more flavour-consistent
Elbereth now has to be on a square by itself; it's hard to justify
why text before it would prevent it working if text after it fails
to prevent it working.
2016-10-17 17:31:00 +01:00
Pasi Kallinen
14bd550481 Wielding Trollsbane prevents trolls from reviving 2016-10-15 19:47:04 +03:00
Pasi Kallinen
35f46a0149 Put throne room gold in the chest 2016-10-15 10:26:20 +03:00
Pasi Kallinen
17e13f1e53 X11: Handle define-lines in NetHack.ad
xrdb can load a X recource file with #define-lines, but NetHack
cannot. Substitute the defines in Makefile during compile.

Requires grep
2016-10-14 16:50:25 +03:00
PatR
9f8f22ea4a more lint and formatting
Fix a C89/C90 complaint about a declaration following executable code.
The rest is formatting (of stuff I saw rather than systematic fixups).
2016-10-13 12:08:06 -07:00
Pasi Kallinen
abb4f0fab2 Allow toggling menu for any travel target list 2016-10-13 20:16:21 +03:00
Pasi Kallinen
4af4fc1143 Occasionally remove maze dead ends, creating loops 2016-10-12 18:39:24 +03:00
PatR
90ca75d0d9 lint fix 2016-10-11 16:03:45 -07:00
Pasi Kallinen
9858e46f64 Show correct keybind in ext cmd list 2016-10-11 23:03:36 +03:00
Pasi Kallinen
23157c4830 Free allocated memory 2016-10-11 18:34:41 +03:00
Pasi Kallinen
09c517e830 Fix valgrind complaint 2016-10-11 17:59:35 +03:00
Pasi Kallinen
56e51b9b6b Add wizmode command to recreate current level 2016-10-11 17:26:32 +03:00
Pasi Kallinen
63487e8dbd Sometimes create mazes with wide corridors
...and/or thick walls.
2016-10-11 15:06:39 +03:00