Merge branch 'nhmall-booktribute' of https://rodney.nethack.org:20040/git/NHsource into nhmall-booktribute

dat/tribute

@@ -44,9 +44,9 @@ Equal Rites, by Terry Pratchett
 #
 %title Mort (1)
 %passage 1
-Mort, by Terry Pratchett
+Ankh-Morpork had dallied with many forms of government and hand ended up with that form of democracy known as One Man, One Vote. The Patrician was the Man; he had the Vote.
-
 
+  [Mort, by Terry Pratchett]
 %e passage
 %e title
 #
@@ -182,11 +182,79 @@ Interesting Times, by Terry Pratchett
 #
 #
 #
-%title Maskerade (1)
+%title Maskerade (4)
 %passage 1
-Maskerade, by Terry Pratchett
+  'Maybe you could... help us?'
+  'What's wrong?'
+  'It's my boy...'
+  Granny opened the door further and saw the womand standing behind Mr. Slot. One look at her face was enough. There was a bundle in her arms.
+  Granny stepped back. 'Bring him in and let me have a look at him.'
+  She took the baby from the woman, sat down on the room's one chair, and pulled back the blanket.
+  'Hmm,' said Granny, after a while.
+  'There's a curse on this house, that's what it is,' said Slot. 'My best cow's been taken mortally sick, too.'
+  'Oh? You have a cowshed?' siad Granny. 'Very good place for a sick-room, a cowshed. It's the warmth. You better show me were it is.'
+  'You want to take the boy down there?'
+  'Right now.'
+  [...]
+  'How many have you come for?'
+  ONE.
+  'The cow?'
+  Death shook his head.
+  'It could be the cow.'
+  NO. THAT WOULD BE CHANGING HISTORY.
+  'History is about things changing.'
+  NO.
+  Granny sat back.
+  'Then I challenge you to a game. That's traditional. That's /allowed/.'
+  Death was silent for a moment.
+  THIS IS TRUE.
+  'Good.'
+  HOWEVER... YOU UNDERSTAND THAT TO WIN ALL YOU MUST GAMBLE ALL?
+  'Double or quits? Yes, I know.'
+  BUT NOT CHESS.
+  'Can't abide chess.'
+  OR CRIPPLE MR ONION. I'VE NEVER BEEN ABLE TO UNDERSTAND THE RULES.
+  'Very well. How about one hand of poker? Five cards each, no draws? Sudden death, as they say.'
+  Death thought about this, too.
+  YOU KNOW THIS FAMILY?
+  'No.'
+  THEN WHY?
+  'Are we talking or are we playing?'
+  OH, VERY WELL.
+  Granny looked at her cards, and threw them down.
+  FOUR QUEENS. HMM. THAT /IS/ VERY HIGH.
+  Death looked down at his cards, and then up into Granny's steady, blue-eyed gaze.
+  Neither moved for some time.
+  Then Death laid the hand on the table.
+  I LOSE. ALL I HAVE IS FOUR ONES.
 
+    [Maskerade, by Terry Pratchett]
+%e passage
+%passage 2
+    Ahahahahaha!
+    Ahahahaha!
+    Aahahaha!
+    BEWARE!!!!!
+    Yrs sincerely,
+    The Opera Ghost
+  'What sort of person,' said Salzella, 'sits down and /writes/ a maniacal laugh? And all those exclamation marks, you notice? Five? A sure sign of someone who wears his underpants on his head. Opera can do that to a man.'
 
+    [Maskerade, by Terry Pratchett]
+%e passage
+%passage 3
+  Agnes had woken up one morning with the horrible realization that she'd been saddled with a lovely personality. It was the lack of choice that rankled. No one had asked her, before she was born, whether she wanted a lovely personality or whether she'd prefer, say, a miserable personality but a body that could take size 9 in dresses. Instead, people would take pains to tell her that beauty was only skin-deep, as if a man ever fell for an attractive pair of kidneys.
+
+    [Maskerade, by Terry Pratchett]
+%e passage
+%passage 4
+  'And what can I get you, officers?' she said.
+  'Officers? Us? What makes you think we're watchment?'
+  'He's got a helmet on,' Nanny pointed out.
+  'Milit'ry chic,' Nobby said. 'It's just a fashion accessory. Actually, we are gentlemen of means and have nothing to do with the City Watch whatsoever.'
+  'Well, /gentlemen/, would you like some wine?'
+  'Not while we on duty, t'anks', said the troll.
+
+    [Maskerade, by Terry Pratchett]
 %e passage
 %e title
 #

src/files.c

@@ -3329,7 +3329,7 @@ const char *filename;
 #define PASSAGESCOPE 3
 
 void
-read_tribute(tribsection, tribtitle, tribpassage, text, maxtextlines)
+read_tribute(tribsection, tribtitle, tribpassage)
 char *tribsection, *tribtitle;
 int  tribpassage;
 {

sys/unix/Makefile.top

@@ -87,7 +87,7 @@ SPEC_LEVS = asmodeus.lev baalz.lev bigrm-?.lev castle.lev fakewiz?.lev \
 QUEST_LEVS = ???-goal.lev ???-fil?.lev ???-loca.lev ???-strt.lev
 
 DATNODLB = $(VARDATND) license
-DATDLB = $(DATHELP) dungeon $(SPEC_LEVS) $(QUEST_LEVS) $(VARDATD)
+DATDLB = $(DATHELP) dungeon $(SPEC_LEVS) $(QUEST_LEVS) $(VARDATD) tribute
 DAT = $(DATNODLB) $(DATDLB)
 
 $(GAME):