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

blind pronunciation of scroll formula not a literacy violation

Browse Source 
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
This commit is contained in:
nhmall
2015-12-18 19:02:19 -05:00
parent 97974e9968
commit 5ee09d66d6
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/fixes36.1
View File

@@ -43,6 +43,8 @@ new high score with ", while helpless" attribute appended would erroneously
allow bright aliases for colors in menucolors allow bright aliases for colors in menucolors
make MAXPLAYERS option in sysconf accept 0 value make MAXPLAYERS option in sysconf accept 0 value
avoid hearing yelps when you are deaf 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 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 different feedback for reading a scroll of mail created by writing with marker
wizard mode #wizintrinsic wizard mode #wizintrinsic
Platform- and/or Interface-Specific New Features Platform- and/or Interface-Specific New Features
------------------------------------------------ ------------------------------------------------

7
src/read.c
View File

@@ -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. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -171,6 +171,7 @@ doread()
{ {
register struct obj *scroll; register struct obj *scroll;
boolean confused, nodisappear; boolean confused, nodisappear;
boolean pronounced_not_read = FALSE;
known = FALSE; known = FALSE;
if (check_capacity((char *) 0)) if (check_capacity((char *) 0))
@@ -299,6 +300,8 @@ doread()
what = "mystic runes"; what = "mystic runes";
else if (!scroll->dknown) else if (!scroll->dknown)
what = "formula on the scroll"; what = "formula on the scroll";
else if (scroll->dknown)
pronounced_not_read = TRUE;
if (what) { if (what) {
pline("Being blind, you cannot read the %s.", what); pline("Being blind, you cannot read the %s.", what);
return 0; return 0;
@@ -329,7 +332,7 @@ doread()
/* Novel conduct is handled in read_tribute so exclude it too*/ /* Novel conduct is handled in read_tribute so exclude it too*/
if (scroll->otyp != SPE_BOOK_OF_THE_DEAD if (scroll->otyp != SPE_BOOK_OF_THE_DEAD
&& scroll->otyp != SPE_BLANK_PAPER && scroll->otyp != SCR_BLANK_PAPER && scroll->otyp != SPE_BLANK_PAPER && scroll->otyp != SCR_BLANK_PAPER
&& scroll->otyp != SPE_NOVEL) && scroll->otyp != SPE_NOVEL && !pronounced_not_read)
u.uconduct.literate++; u.uconduct.literate++;
if (scroll->oclass == SPBOOK_CLASS) { if (scroll->oclass == SPBOOK_CLASS) {