Merge branch 'master' into win32-x64-working

Conflicts:
	src/do_name.c
	src/trap.c
	src/zap.c
	win/X11/winmenu.c

include/context.h

@@ -78,6 +78,14 @@ struct polearm_info {
 	unsigned m_id;		/* monster id of hitmon, in save file */
 };
 
+struct tribute_info {
+	size_t tributesz;	/* make it possible to skip this in future */
+	boolean  enabled;	/* Do we have tributes turned on? */
+	Bitfield(bookstock,1);	/* Have we stocked the book? */
+				/* Markers for other tributes can go here */
+	/* 31 free bits */
+};
+	
 struct context_info {
 	unsigned ident;		/* social security number for each monster */
 	unsigned no_of_wizards; /* 0, 1 or 2 (wizard and his shadow) */
@@ -109,6 +117,7 @@ struct context_info {
 	struct takeoff_info takeoff;
 	struct warntype_info warntype;
 	struct polearm_info polearm;
+	struct tribute_info tribute;
 };
 
 extern NEARDATA struct context_info context;

include/extern.h

@@ -394,6 +394,8 @@ E const char *NDECL(roguename);
 E struct obj *FDECL(realloc_obj,
 		(struct obj *, int, genericptr_t, int, const char *));
 E char *FDECL(coyotename, (struct monst *,char *));
+E const char *FDECL(noveltitle, (int *));
+E const char *FDECL(lookup_novel, (const char *, int *));
 
 /* ### do_wear.c ### */
 
@@ -749,6 +751,7 @@ E void NDECL(really_close);
 #ifdef DEBUG
 E boolean FDECL(showdebug, (const char *));
 #endif
+E void FDECL(read_tribute, (const char *,const char *,int));
 
 /* ### fountain.c ### */
 

include/global.h

@@ -33,6 +33,7 @@
 #define EPITAPHFILE   "epitaph"	/* random epitaphs on graves */
 #define ENGRAVEFILE   "engrave" /* random engravings on the floor */
 #define BOGUSMONFILE  "bogusmon" /* hallucinatory monsters */
+#define TRIBUTEFILE   "tribute" /* 3.6 tribute to Terry Pratchett */
 #define LEV_EXT ".lev"		/* extension for special level files */
 
 

include/obj.h

@@ -108,6 +108,7 @@ struct obj {
 	int	corpsenm;	/* type of corpse is mons[corpsenm] */
 #define leashmon  corpsenm	/* gets m_id of attached pet */
 #define fromsink  corpsenm	/* a potion from a sink */
+#define novelidx corpsenm	/* 3.6.0 tribute - the index of the novel title */
 #define record_achieve_special corpsenm
 	int usecount;		/* overloaded for various things that tally */
 #define spestudied usecount	/* # of times a spellbook has been studied */