blind pronunciation of scroll formula not a literacy violation

bug bz25, no web id, devteam email received on 1/3/2006 6:15 AM:
> Reading a scroll while blind shouldn't violate illiterate conduct

diff --git a/doc/fixes36.1 b/doc/fixes36.1
index 9b47321e5589a7020304e887bc5eb30307ff8592..595831640a995d914d7100fae48fae209d550fd4 100644 (file)
--- a/doc/fixes36.1
+++ b/doc/fixes36.1
@@ -43,6 +43,8 @@ new high score with ", while helpless" attribute appended would erroneously
 allow bright aliases for colors in menucolors
 make MAXPLAYERS option in sysconf accept 0 value
 avoid hearing yelps when you are deaf
+make corpse visible if stethoscope told you about it being there
+blind pronounciation of scroll formula will not violate literacy conduct
 
 
 Platform- and/or Interface-Specific Fixes
@@ -67,6 +69,7 @@ naming Sting or Orcrist now breaks illiterate conduct
 different feedback for reading a scroll of mail created by writing with marker
 wizard mode #wizintrinsic
 
+
 Platform- and/or Interface-Specific New Features
 ------------------------------------------------
 

diff --git a/src/read.c b/src/read.c
index 948156dc7aafb5962a46bf9c10fe8a7190ec6f1e..a141c157bb48952580fceb87164fee23ec3b192d 100644 (file)
--- a/src/read.c
+++ b/src/read.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6 read.c  $NHDT-Date: 1450261365 2015/12/16 10:22:45 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.128 $ */
+/* NetHack 3.6 read.c  $NHDT-Date: 1450483329 2015/12/19 00:02:09 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.129 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -171,6 +171,7 @@ doread()
 {
     register struct obj *scroll;
     boolean confused, nodisappear;
+    boolean pronounced_not_read = FALSE;
 
     known = FALSE;
     if (check_capacity((char *) 0))
@@ -299,6 +300,8 @@ doread()
             what = "mystic runes";
         else if (!scroll->dknown)
             what = "formula on the scroll";
+        else if (scroll->dknown)
+            pronounced_not_read = TRUE;
         if (what) {
             pline("Being blind, you cannot read the %s.", what);
             return 0;
@@ -329,7 +332,7 @@ doread()
     /* Novel conduct is handled in read_tribute so exclude it too*/
     if (scroll->otyp != SPE_BOOK_OF_THE_DEAD
         && scroll->otyp != SPE_BLANK_PAPER && scroll->otyp != SCR_BLANK_PAPER
-        && scroll->otyp != SPE_NOVEL)
+        && scroll->otyp != SPE_NOVEL && !pronounced_not_read)
         u.uconduct.literate++;
 
     if (scroll->oclass == SPBOOK_CLASS) {