nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'origin/NetHack-3.6.0'

Browse Source
This commit is contained in:
keni
2016-08-28 19:07:39 -04:00
parent 6f16ef03a8 95447b1cf5
commit 64f9833cc9
6 changed files with 81 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
dat/tribute
View File

@@ -240,7 +240,7 @@ amounts of raw enchantment.
# p. 166 ('Lio!rt' with embedded exclamation point is correct; book's text
# is missing the opening quote before ["]You arrogant barbarian--")
%passage 10
"I challange you," said Hrun, glaring at the brothers, "both at once."
"I challenge you," said Hrun, glaring at the brothers, "both at once."
Lio!rt and Liartes exchanged looks.
@@ -259,9 +259,9 @@ Lio!rt scowled. "You arrogant barbarian--"
The Loremaster put out a blue-veined hand to restrain him.
"It is forebidden to fight on the Killing Ground," he said, and paused
"It is forbidden to fight on the Killing Ground," he said, and paused
while he considered the sense of this. "You know what I mean, anyway," he
hazarded, giving up, and added, "As the challanged parties my lords Lio!rt
hazarded, giving up, and added, "As the challenged parties my lords Lio!rt
and Liartes have choice of weapons."
"Dragons," they said together. Liessa snorted.
@@ -343,7 +343,7 @@ bull, got chest muscles like a sack of footballs. I mean, he's the Disc's
greatest warrior, a legend in his own lifetime. I remember my grandad
telling me he saw him... my grandad telling me he... my grandad...'
He faltered under the gimlit gaze.
He faltered under the gimlet gaze.
'Oh,' he said. 'Oh. Of course. Sorry.'
@@ -388,7 +388,7 @@ GET TO THE BOTTOM OF THIS IF IT KILLS ME. FIGURATIVELY SPEAKING OF COURSE.'
# "Why have Rincewind and Twoflower fallen off the Disc's rim?",
# alluding to the conclusion of /The Colour of Magic/;
# in /Sourcery/ and /Interesting Times/ and probably others, the
# famous philosohper's name is spelled "Ly Tin Wheedle")
# famous philosopher's name is spelled "Ly Tin Wheedle")
%passage 3
[...] such questions take time and could be more trouble than they are
worth. For example, it is said that someone at a party once asked the
@@ -783,7 +783,7 @@ back of his skull.
[Equal Rites, by Terry Pratchett]
%e passage
# p. 185 (actually uses four periods to mark a sentence ending in a elipsis)
# p. 185 (actually uses four periods to mark a sentence ending in a ellipsis)
%passage 10
There may be universes where librarianship is considered a peaceful sort of
occupation, and where the risks are limited to large volumes falling off
@@ -928,7 +928,7 @@ The man beamed and bowed. "I know the very place, noxious extrusion of the
bowels, if you would be so good as to follow me."
Mort hurried out after him. The ancient ancestor watched them go with a
critical expression, its jowls rhymically chewing.
critical expression, its jowls rhythmically chewing.
"That was what they call a demon around here?" it said. "Offler rot this
country of dampness, even their demons are third-rate, not a patch on the
@@ -1164,13 +1164,13 @@ He looked the kind of person who, when they blinked, you mark it off on
the calendar.
Practically none of this was in fact the case, although he did have a small
and exceedingly elderly wire-haired terrior called Wuffles that smelled
and exceedingly elderly wire-haired terrier called Wuffles that smelled
badly and wheezed at people. It was said to be the only thing in the
entire world he truly cared about. He did of course sometimes have people
horribly tortured to death, but this was considered to be perfectly
acceptable behaviour for a civic ruler and generally approved of by the
overwhelming majority of citizens.(1) The people of Ankh are of a
practical persuasion, and felt that the Patrician's edict forebidding all
practical persuasion, and felt that the Patrician's edict forbidding all
street theatre and mime artists made up for a lot of things. He didn't
administer a reign of terror, just the occasional light shower.
@@ -1300,7 +1300,7 @@ the castle cats were either pampered pets or flat-eared kitchen and stable
habitues who generally resembled the very rodents they lived on. This cat,
on the other hand, was its own animal. All cats give that impression, of
course, but instead of the mindless animal self-absorption that passes for
secret wisdom in the creatures, Greebo radiated genuime intelligence. He
secret wisdom in the creatures, Greebo radiated genuine intelligence. He
also radiated a smell that would have knocked over a wall and caused sinus
trouble in a dead fox.
@@ -1343,7 +1343,7 @@ broomstick held stiff-armed beside her. At last the magic caught, and she
managed to vault clumsily on to it before it trundled into the night sky
as gracefully as a duck with one wing missing.
From above the trees came a muffled cursd against all dwarfish mechanics.
From above the trees came a muffled curse against all dwarfish mechanics.
(1) She did nothing, although sometimes when she saw him in the village
she'd smile in a faint, puzzled way. After three weeks of this the
@@ -1385,7 +1385,7 @@ of bloodshot eyes.
"I didn't want to," he hissed conspiratorially. "They made me do it. I
didn't want--"
The door swung open. The dutchess filled the doorway. In fact, she was
The door swung open. The duchess filled the doorway. In fact, she was
nearly the same shape.
"Leonal!" she barked.
@@ -1525,7 +1525,7 @@ disappearing overnight was a bit of a first.
and cities. After all, when over an area of a hundred square miles the same
year is variously the Year of the Small Bat, the Anticipated Monkey, the
Hunting Cloud, Fat Cows, Three Bright Stallions and at least nine numbers
recording the time since(2) assorted kings, prohets, and strange events were
recording the time since(2) assorted kings, prophets, and strange events were
either crowned, born or happened, and each year was a different number of
months, and some of them don't have weeks, and one of them refuses to accept
the day as a measure of time, the only things it is possible to be sure of
@@ -1791,7 +1791,7 @@ yards away rather than the innocent bystander at whom it was aimed.
%e passage
# p. 26 (first and second paragraphs are actually end of one section,
# start of next one; first 'Thunder rolled...' had three dot
# elipsis, second hand has four, elipsis plus final period--
# ellipsis, second has four, elipsis plus final period--
# first changed to four here so that they match)
%passage 3
Thunder rolled....
@@ -1953,7 +1953,7 @@ say. History. 'You're history!' you say."
[...(quite a while later)...]
"You heard the Man," he rasped. "One false move and you're... you're--" he
took a desparate stab at it--"you're Home Economics!"
took a desperate stab at it--"you're Home Economics!"
[Guards! Guards!, by Terry Pratchett]
%e passage
@@ -1963,7 +1963,7 @@ took a desparate stab at it--"you're Home Economics!"
# The original publication of /Eric/ featured extensive illustrations by
# Josh Kirby but the mass-market paperback edition contains none of them
# and omits his name. In the Harper Torch edition, the list of other
# books by the same auther has "Eric (with Josh Kirby)" even though the
# books by the same author has "Eric (with Josh Kirby)" even though the
# copyright and title pages of that very book do not mention him.
#
%title Eric (9)
@@ -2100,7 +2100,7 @@ was a neuralger."
# p. 35 (passage is a footnote)
%passage 6
Demons and their Hell are quite different from the Dungeon Dimensions,
those endlass parallel wastelands outside space and time. The sad, mad
those endless parallel wastelands outside space and time. The sad, mad
Things in the Dungeon Dimensions have no understanding of the world but
simply crave light and shape and try to warm themselves by the fires of
reality, clustering around it with about the same effect--if they ever
@@ -2122,7 +2122,7 @@ sign of a diseased mind."
[Eric, by Terry Pratchett]
%e passage
# pp. 178-179 (Ponce da Quirm, encoutered in hell)
# pp. 178-179 (Ponce da Quirm, encountered in hell)
%passage 8
"So you didn't find the Fountain of Youth, then," he said, feeling that he
should make some conversation.
@@ -2201,7 +2201,7 @@ dog, industriously scratching itself. It looked up slowly, and said "Woof?"
[...]
Victor poked an exploratory finger in his ear. It must have been a trick
of an echo, or something. It wasn't that the dog had gone "woof!?, although
of an echo, or something. It wasn't that the dog had gone "woof!", although
that was practically unique in itself; most dogs in the universe /never/
went "woof!", they had complicated barks like "whuuugh!" and "hwhoouf!".
No, it was that it hadn't in fact /barked/ at all. It had /said/ "woof".
@@ -2447,7 +2447,7 @@ villages where they dance the real Morris dance, for example, they believe
that no one is finally dead until the ripples they cause in the world die
away--until the clock he wound up winds down, until the wine she made has
finished its ferment, until the crop they planted is harvested. The span
of someone's life, they say, is only the core of their actual existance.
of someone's life, they say, is only the core of their actual existence.
[Reaper Man, by Terry Pratchett]
%e passage
@@ -2495,16 +2495,17 @@ Anyway, either the gods are there whether you believe or not, or exist only
as a function of the belief, so either way you might as well ignore the
whole business and, as it were, eat off your knees.
Nevertheless, there is a small chaple off the University's Great Hall,
Nevertheless, there is a small chapel off the University's Great Hall,
because while the wizards stand right behind the philosophy as outlined
above, you don't become a successful wizard by getting up gods' noses even
if those noses only exist in an ethereal or metaphorical sense. Because
while wizards don't belive in gods they know for a fact that /gods/ believe
while wizards don't believe in gods they know for a fact that /gods/ believe
in gods.
[Reaper Man, by Terry Pratchett]
%e passage
# p. 50 (Dibbler is so low because he's on steps leading down to a cellar)
# p. 50 (Dibbler is so low because he's on steps leading down to a cellar;
# 'favour' and 'pedlar' are the spelling used)
%passage 7
"Sergeant!"
@@ -2877,7 +2878,7 @@ gravitate to gravity.
"How come you're in the palace guard, Casanunda?"
"Soldier of fortune takes whatever jobs are going, Mrs. Ogg," said Casanunda
earestly.
earnestly.
"But all the rest of 'em are six foot tall and you're--of the shorter
persuasion."
@@ -2896,7 +2897,7 @@ There was silence for a while.
[Witches Abroad, by Terry Pratchett]
%e passage
# pp. 285-286 (Greebo is still in human form)
# pp. 285-286 (Greebo is still in human form; 'rationalise' is accurate)
%passage 14
Greebo leapt.
@@ -2907,8 +2908,8 @@ is beaten and knows it. There's no triumph over a corpse, but a beaten
opponent, who will remain beaten every day for the remainder of their sad
and wretched life, is something to treasure.
Cats do not, of course, rationise this far. They just like to send someone
limping off minus a tail and a few square inches of fur.
Cats do not, of course, rationalise this far. They just like to send
someone limping off minus a tail and a few square inches of fur.
Greebo's technique was unscientific and wouldn't have stood a chance against
any decent swordsmanship, but on his side was the fact that it is almost
@@ -3293,7 +3294,7 @@ There was a burst of octarine light.
turned to Ponder Stibbons. "Interestin' use of Stacklady's Morphic
Resonator here, I hoped you noticed."
Ponder lookd down.
Ponder looked down.
The chieftain had been turned into a pumpkin, although, in accordance with
the rules of universal humor, he still had his hat on.
@@ -3329,7 +3330,7 @@ that'd work for all of two seconds, wouldn't it?
Her eye was drawn by some kind of horrible magic back to the room's
garderobe, lurking behind its curtain.
Margrat lifted the lid. The shaft was definitely wide enough to admit a
Magrat lifted the lid. The shaft was definitely wide enough to admit a
body. Garderobes were notorious in that respect. Several unpopular kings
met their end, as it were, in the garderobe, at the hands of an assassin
with good climbing ability, a spear, and a fundamental approach to politics.
@@ -3345,7 +3346,7 @@ That was a portrait she'd never seen before. She'd never walked down this
far. The idiot vapidity of the assembled queens had depressed her. But
this one...
Ths one, somehow, reached out to her.
This one, somehow, reached out to her.
She stopped.
@@ -3475,7 +3476,7 @@ metaphorical. Just a doughnut. One doughnut."
"You only had to say."
Harge brushed off his vest, gave Vimes a hurt look, and went back into
Harga brushed off his vest, gave Vimes a hurt look, and went back into
the kitchen.
[Men at Arms, by Terry Pratchett]
@@ -3582,7 +3583,7 @@ Sometimes it's better to light a flamethrower than curse the darkness.
They stretched away in the candlelight, shelf on shelf of them, tiny
little clown faces--as if a tribe of headhunters had suddenly developed
a sophisicated sense of humor and a desire to make the world a better
a sophisticated sense of humor and a desire to make the world a better
place.
[Men at Arms, by Terry Pratchett]
@@ -3750,7 +3751,7 @@ seemed to be a lot of rats around. Lord Vetinari had listened carefully
while the problem was explained, and had solved the thing with one
memorable phrase which said a lot about him, about the folly of bounty
offers, and about the natural instinct of Ankh-Morporkians in any
situtation involving money: "Tax the rat farms."
situation involving money: "Tax the rat farms."
[Soul Music, by Terry Pratchett]
%e passage
@@ -3875,7 +3876,7 @@ it is better organized.
%e passage
# p. 14
%passage 4
Many things went on at Unseen University and, regretably, teaching had to
Many things went on at Unseen University and, regrettably, teaching had to
be one of them. The faculty had long ago confronted this fact and had
perfected various devices for avoiding it. But this was perfectly all
right because, to be fair, so had the students.
@@ -3890,7 +3891,7 @@ Reader in Woolly Thinking(1)) that lectures had taken place /in essence/,
so that was all right, too.
And therefore education at the University mostly worked by the age-old
method of putting a lot of young people in the vicinty of a lot of books
method of putting a lot of young people in the vicinity of a lot of books
and hoping that something would pass from one to the other, while the
actual young people put themselves in the vicinity of inns and taverns
for exactly the same reason.
@@ -3899,7 +3900,7 @@ for exactly the same reason.
[Interesting Times, by Terry Pratchett]
%e passage
# p. 20 (speaker is Archchancellor Ridcully; sad, hopless person is Rincewind)
# p. 20 (speaker is Archchancellor Ridcully; sad, hopeless person is Rincewind)
%passage 5
"Wizzard?" he said. "What kind of sad, hopeless person needs to write
WIZZARD on their hat?"
@@ -4199,7 +4200,7 @@ woman was a thin woman trying to get out,(1) so she'd named her Perdita.
She was a good repository for all those thoughts that Agnes couldn't think
on account of her wonderful personality. Perdita would use black writing
paper if she could get away with it, and would be beautifully pale instead
of embarassingly flushed. Perdita wanted to be an interestingly lost soul
of embarrassingly flushed. Perdita wanted to be an interestingly lost soul
in plum-colored lipstick. Just occasionally, though, Agnes thought
Perdita was as dumb as she was.
@@ -4387,7 +4388,7 @@ years in the merchant navy and has recently fallen on hard times," and
then unroll a lot of supercilious commentary about calluses and stance
and the state of a man's boots, when /exactly the same/ comments could
apply to a man who was wearing his old clothes because he'd been doing a
spot of home bricklaying for a new barbecue pit, and had been tatooed
spot of home bricklaying for a new barbecue pit, and had been tattooed
once when he was drunk and seventeen(1) and in fact got seasick on a wet
pavement. What arrogance! What an insult to the rich and chaotic variety
of the human experience.
@@ -4523,7 +4524,7 @@ of course, to the bottom of the C.
the science of this very specialized "concrete overshoe" form of waste
disposal. An unfortunate drawback of the process was the tendency for
bits of the client to eventually detach and float to the surface, causing
much comment among the general poplation. Enough chicken wire, he pointed
much comment among the general population. Enough chicken wire, he pointed
out, would solve that, while also allowing the ingress of crabs and fish
going about their vital recycling activities.
@@ -4642,7 +4643,7 @@ the white and green symbolize a small parasitic plant?"
"Exactly, Archchancellor," said the Senior Wrangler, who was now just
hanging on.
"Funny thing, that," said Ridcully, in the same thoughful tone of voice.
"Funny thing, that," said Ridcully, in the same thoughtful tone of voice.
"That statement is either so deep it would take a lifetime to fully
comprehend every particle of its meaning, or it is a load of absolute
tosh. Which is it, I wonder?"
@@ -4742,7 +4743,7 @@ YES. JUSTICE. MERCY. DUTY. THAT SORT OF THING.
[Hogfather, by Terry Pratchett]
%e passage
# p. 343 (Mr. Teatime [pronounced Teh-ah-tim-eh] has just been thwarted in
# his elabrate plot to lure and then kill Death)
# his elaborate plot to lure and then kill Death)
%passage 10
"What did he do it all for?" said Susan. "I mean, why? Money? Power?"
@@ -4830,7 +4831,7 @@ please? My clerk here will give you a list of the prime defaulters.'
'Right, sir. And if they resist, sir?' said Vimes, smiling nastily.
'Oh, how can they resist, commander? This is the will of our civic
leaders.' He took the paper his clerk proferred. 'Let me see, now. Top
leaders.' He took the paper his clerk profferred. 'Let me see, now. Top
of the list--'
Lord Selachii coughed hurriedly. 'Far too late for that sort of nonsense
@@ -4864,7 +4865,7 @@ graduate student at the University of What Some Bloke In the Pub Told Me.
%passage 5
"Hey, that's Reg Shoe! He's a zombie. He falls to bits all the time!"
"Very big man in undead community, sir," said Carrott.
"Very big man in the undead community, sir," said Carrot.
"How come /he/ joined?"
@@ -5313,7 +5314,7 @@ A million dead people can't have been wrong, can they?
%e passage
# p. 233 (Harper Torch edition) [this is a footnote]
%passage 2
He'd noticed that sex bore some resemblance to cookery: It facinated
He'd noticed that sex bore some resemblance to cookery: It fascinated
people, they sometimes bought books full of complicated recipes and
interesting pictures, and sometimes when they were really hungry they
created vast banquets in their imagination--but at the end of the day
@@ -5324,7 +5325,7 @@ maybe had a slice of tomato.
%e passage
# pp. 80-81 (Harper Torch edition) [the pigeon is trained to carry messages]
%passage 3
Constable Shoe saluted, but a litle testily. He'd been waiting rather a
Constable Shoe saluted, but a little testily. He'd been waiting rather a
long time.
"Afternoon, Sergeant--"
@@ -5590,14 +5591,14 @@ Day By His Wife.
[Thief of Time, by Terry Pratchett]
%e passage
# p. 53 ('... with the chorus:', '"Do not act...' are separate paragraphs;
# 'challanger' has been cowed after finding out that the little old
# man he challanged--for entering the dojo--is actually Lu-Tze)
# 'challenger' has been cowed after finding out that the little old
# man he challenged--for entering the dojo--is actually Lu-Tze)
%passage 3
As Lobsang followed the ambling Lu-Tze, he heard the dojo master, who like
all teachers never missed an opportunity to drive home a lesson, say:
"Dojo! What is Rule One?"
Even the cowering challanger mumbled along with the chorus:
Even the cowering challenger mumbled along with the chorus:
"Do not act incautiously when confronting a little bald wrinkly smiling
man!"
@@ -6867,10 +6868,10 @@ has anyone checked lately?
%passage 3
All witches are a bit odd. Tiffany had got used to odd, so that odd seemed
quite normal. There was Miss Level, for example, who had two bodies,
although one of them was imaginery. Mistress Pullunder, who bred pedigreed
although one of them was imaginary. Mistress Pullunder, who bred pedigreed
earthworms and gave them all names... well, she was hardly odd at all, just
a bit peculiar, and anyway earthworms were quite interesting in a basically
uninterestng kind of way. And there had been Old Mother Dismass, who
uninteresting kind of way. And there had been Old Mother Dismass, who
suffered from bouts of temporal confusion, which can be quite strange when
it happens to a witch; her mouth never moved in time with her words, and
sometimes her footsteps came down the stairs ten minutes before she did.
@@ -7177,7 +7178,7 @@ within an inch of your life."
only got two paragraphs in the /Tanty Bugle/!(1) Two paragraphs, may I
say, for a life of ingenious, inventive, and strictly nonviolent crime?
I could have been an example to the youngsters! Page one got hogged by
the Dyslectic Alphabet Killer, and he only maanaged A and W!"
the Dyslectic Alphabet Killer, and he only managed A and W!"
"I confess the editor does appear to believe that it is not a proper crime
unless someone is found in three alleys at once, but that is the price of
@@ -7198,7 +7199,7 @@ Moist winced at this. "And if I /don't/ do what you say?"
"Hmm? Oh, you misunderstand me, Mr. Lipwig. That is what will happen to
you if you decline my offer. If you accept it, you will survive on your
wits against powerful and dangerous enemies, with every day presenting
fresh challanges. Someone may even try to kill you."
fresh challenges. Someone may even try to kill you."
"What? Why?"
@@ -7232,7 +7233,7 @@ It was from Spike!
He read:
SUCCESS. RETURNING DAY AFTER TOMMOROW.
SUCCESS. RETURNING DAY AFTER TOMORROW.
ALL WILL BE REVEALED. S.
Moist put it down carefully.
@@ -7622,7 +7623,7 @@ raised his voice. "Arrange yourselves into two teams and play football!"
# p. 268 (passage starts mid-paragraph; Glenda is cleaning UU's Night Kitchen)
%passage 10
[...] If you wanted a job done properly, you had to do it yourself.
Juliet's verison of cleanliness was next to godliness, which was to say
Juliet's version of cleanliness was next to godliness, which was to say
it was erratic, past all understanding and seldom seen.
[Unseen Academicals, by Terry Pratchett]
@@ -8017,7 +8018,7 @@ being eaten by the pillows, and said to Sybil, "Do the Rust family have a
place down here?"
Too late he reflected that this might be a bad move because she might well
have told him all about it on one of those occasions when, so unusally for
have told him all about it on one of those occasions when, so unusually for
a married man, he was not paying much attention to what his wife was
saying, and therefore he might be the cause of grumpiness in those
precious, warm minutes before sleep. All he could see of her right now
@@ -8204,7 +8205,7 @@ There was a young goblin waiting there, rather nervous, clasping what
looked like two wheels held together by not very much. The wheels were
spinning.
Durmknott cleared his throat. "Show his lordship your new invention,
Drumknott cleared his throat. "Show his lordship your new invention,
Mister Of the Wheel the Spoke."
(1) Frankly most palaces are just like this. Their backsides do not bear

6
doc/Guidebook.mn
View File

@@ -295,7 +295,7 @@ do other tasks requiring agility or manipulation of objects.
.lp Constitution
Constitution affects your ability to recover from injuries and other
strains on your stamina.
When strength is low or modest, consitution also affects how much you
When strength is low or modest, constitution also affects how much you
can carry. With sufficiently high strength, the contribution to
carrying capacity from your constitution no longer matters.
.lp Intelligence
@@ -2658,7 +2658,7 @@ attack to which it is resistant (default on). Persistent.
Boldface monsters and ``\fB--More--\fP'' (default off). Persistent.
.lp statushilites
Enable coloring of status fields (default off).
See ``Configuring Status Hilites'' for futher information.
See ``Configuring Status Hilites'' for further information.
.lp suppress_alert
This option may be set to a NetHack version level to suppress
alert notification messages about feature changes for that
@@ -2694,7 +2694,7 @@ When using the `/' or `;' commands to look around on the map with
on, display coordinates after the description.
Also works in other situations where you are asked to pick a location.
.lp ""
The possibile settings are:
The possible settings are:
.sd
.si
.CC c "compass ('east' or '3s' or '2n,4w');"

4
doc/Guidebook.tex
View File

@@ -346,7 +346,7 @@ do other tasks requiring agility or manipulation of objects.
\item[\bb{Constitution}]
Constitution affects your ability to recover from injuries and other
strains on your stamina.
When strength is low or modest, consitution also affects how much you
When strength is low or modest, constitution also affects how much you
can carry. With sufficiently high strength, the contribution to
carrying capacity from your constitution no longer matters.
%.lp
@@ -3225,7 +3225,7 @@ on, display coordinates after the description.
Also works in other situations where you are asked to pick a location.
%.lp ""
The possibile settings are:
The possible settings are:
%.sd
%.si

2
doc/fixes36.1
View File

@@ -334,6 +334,8 @@ any item drained of enchantment was blamed on the player as far as shop
if user supplied a specific monster name when asked to choose a monster class,
first prefix match was picked rather than best match ("titan" yielded
S_quadruped due to being preceded by "titanothere" in mons[])
change ing_suffix() to not double final 'w' when adding 'ing' ('t=' yielded
"You mime throwwing something.")
Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository

21
src/hacklib.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 hacklib.c $NHDT-Date: 1450178551 2015/12/15 11:22:31 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.46 $ */
/* NetHack 3.6 hacklib.c $NHDT-Date: 1472006251 2016/08/24 02:37:31 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.48 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* Copyright (c) Robert Patrick Rankin, 1991 */
/* NetHack may be freely redistributed. See license for details. */
@@ -297,7 +297,7 @@ char *
ing_suffix(s)
const char *s;
{
const char *vowel = "aeiouy";
static const char vowel[] = "aeiouwy";
static char buf[BUFSZ];
char onoff[10];
char *p;
@@ -305,21 +305,22 @@ const char *s;
Strcpy(buf, s);
p = eos(buf);
onoff[0] = *p = *(p + 1) = '\0';
if ((strlen(buf) > 4)
&& (!strcmpi(p - 3, " on") || !strcmpi(p - 4, " off")
|| !strcmpi(p - 5, " with"))) {
p = strrchr(buf, ' ');
if ((p >= &buf[3] && !strcmpi(p - 3, " on"))
|| (p >= &buf[4] && !strcmpi(p - 4, " off"))
|| (p >= &buf[5] && !strcmpi(p - 5, " with"))) {
p = rindex(buf, ' ');
Strcpy(onoff, p);
*p = '\0';
}
if (!index(vowel, *(p - 1)) && index(vowel, *(p - 2))
&& !index(vowel, *(p - 3))) {
if (p >= &buf[3] && !index(vowel, *(p - 1))
&& index(vowel, *(p - 2)) && !index(vowel, *(p - 3))) {
/* tip -> tipp + ing */
*p = *(p - 1);
*(p + 1) = '\0';
} else if (!strcmpi(p - 2, "ie")) { /* vie -> vy + ing */
} else if (p >= &buf[2] && !strcmpi(p - 2, "ie")) { /* vie -> vy + ing */
*(p - 2) = 'y';
*(p - 1) = '\0';
} else if (*(p - 1) == 'e') /* grease -> greas + ing */
} else if (p >= &buf[1] && *(p - 1) == 'e') /* grease -> greas + ing */
*(p - 1) = '\0';
Strcat(buf, "ing");
if (onoff[0])

6
src/pline.c
View File

@@ -336,6 +336,9 @@ VA_DECL(const char *, line)
pbuf[BUFSZ - 1] = '\0'; /* terminate strncpy or truncate vsprintf */
}
raw_print(line);
#if defined(MSGHANDLER) && (defined(POSIX_TYPES) || defined(__GNUC__))
execplinehandler(line);
#endif
#if !(defined(USE_STDARG) || defined(USE_VARARGS))
VA_END(); /* (see vpline) */
#endif
@@ -655,6 +658,9 @@ const char *line;
(void) fprintf(stderr, "Exec to message handler %s failed.\n",
env);
terminate(EXIT_FAILURE);
} else if (f > 0) {
int status;
waitpid(f, &status, 0);
} else if (f == -1) {
perror((char *) 0);
use_pline_handler = FALSE;