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

novel bit

Browse Source 
Feedback phrasing:  don't refer to a novel as a "spellbook" when
rejecting the attempt to write on one with a magic marker.
This commit is contained in:
PatR
2015-09-14 17:18:05 -07:00
parent 29f1470ec6
commit 80ca4e9837
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/write.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 write.c $NHDT-Date: 1436753530 2015/07/13 02:12:10 $ $NHDT-Branch: master $:$NHDT-Revision: 1.14 $ */ /* NetHack 3.6 write.c $NHDT-Date: 1442276267 2015/09/15 00:17:47 $ $NHDT-Branch: master $:$NHDT-Revision: 1.15 $ */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
#include "hack.h" #include "hack.h"
@@ -124,8 +124,11 @@ register struct obj *pen;
/* get paper to write on */ /* get paper to write on */
paper = getobj(write_on, "write on"); paper = getobj(write_on, "write on");
if (!paper) if (!paper)
return (0); return 0;
typeword = (paper->oclass == SPBOOK_CLASS) ? "spellbook" : "scroll"; /* can't write on a novel (unless/until it's been converted into a blank
spellbook), but we want messages saying so to avoid "spellbook" */
typeword = (paper->otyp == SPE_NOVEL) ? "book"
: (paper->oclass == SPBOOK_CLASS) ? "spellbook" : "scroll";
if (Blind) { if (Blind) {
if (!paper->dknown) { if (!paper->dknown) {
You("don't know if that %s is blank or not.", typeword); You("don't know if that %s is blank or not.", typeword);
@@ -141,7 +144,7 @@ register struct obj *pen;
if (paper->otyp != SCR_BLANK_PAPER && paper->otyp != SPE_BLANK_PAPER) { if (paper->otyp != SCR_BLANK_PAPER && paper->otyp != SPE_BLANK_PAPER) {
pline("That %s is not blank!", typeword); pline("That %s is not blank!", typeword);
exercise(A_WIS, FALSE); exercise(A_WIS, FALSE);
return (1); return 1;
} }
/* what to write */ /* what to write */
@@ -149,7 +152,7 @@ register struct obj *pen;
getlin(qbuf, namebuf); getlin(qbuf, namebuf);
(void) mungspaces(namebuf); /* remove any excess whitespace */ (void) mungspaces(namebuf); /* remove any excess whitespace */
if (namebuf[0] == '\033' || !namebuf[0]) if (namebuf[0] == '\033' || !namebuf[0])
return (1); return 1;
nm = namebuf; nm = namebuf;
if (!strncmpi(nm, "scroll ", 7)) if (!strncmpi(nm, "scroll ", 7))
nm += 7; nm += 7;