Merge branch 'master' into win32-x64-working

src/files.c

@@ -3337,13 +3337,17 @@ boolean wildcards;
 
 /* ----------  BEGIN TRIBUTE ----------- */
 
-/* 3.6 tribute code */
+/* 3.6 tribute code
+ *
+ * Returns TRUE if you were able to read something.
+ *
+ */
 
 #define SECTIONSCOPE 1
 #define TITLESCOPE   2
 #define PASSAGESCOPE 3
 
-void
+boolean
 read_tribute(tribsection, tribtitle, tribpassage)
 const char *tribsection, *tribtitle;
 int  tribpassage;
@@ -3357,12 +3361,13 @@ int  tribpassage;
     const char *badtranslation = "an incomprehensible foreign translation";
     boolean matchedsection = FALSE, matchedtitle = FALSE;
     winid tribwin = WIN_ERR;
+    boolean grasped = FALSE;
 
     /* check for mandatories */
     if (!tribsection || !tribtitle) {
 	pline("It's %s of \"%s\"!",
 		badtranslation, tribtitle);
-	return;
+	return grasped;
     }	
 
     debugpline3("read_tribute %s, %s, %d.", tribsection, tribtitle, tribpassage);
@@ -3371,7 +3376,7 @@ int  tribpassage;
     if (!fp) {
     	/* this is actually an error - cannot open tribute file! */
     	pline("You feel too overwhelmed to continue!");
-	return;
+	return grasped;
     }
 
     /*
@@ -3471,13 +3476,13 @@ cleanup:
 		display_nhwindow(tribwin, FALSE);
 	destroy_nhwindow(tribwin);
 	tribwin = WIN_ERR;
-	u.uconduct.literate++;
+	grasped = TRUE;
     } else {
     	pline("It seems to be %s of \"%s\"!",
 		badtranslation, tribtitle);
     }
 
-    return;
+    return grasped;
 }
 /* ----------  END TRIBUTE ----------- */