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

read.c bits

Browse Source 
Add a comment to seffects_remove_curse().  Also shorten a handful of
wide lines.
This commit is contained in:
PatR
2024-03-13 12:41:41 -07:00
parent 68312f7feb
commit 2006ec6ca3
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/read.c
+10 -6
View File
@@ -144,7 +144,8 @@ tshirt_text(struct obj *tshirt, char *buf)
"Minetown Better Business Bureau", "Minetown Better Business Bureau",
"Minetown Watch", "Minetown Watch",
/* Discworld riff; unfortunately long */ /* Discworld riff; unfortunately long */
"Ms. Palm's House of Negotiable Affection--A Very Reputable House Of Disrepute", "Ms. Palm's House of Negotiable Affection--A Very Reputable"
" House Of Disrepute",
"Protection Racketeer", "Protection Racketeer",
"Real men love Crom", "Real men love Crom",
"Somebody stole my Mojo!", "Somebody stole my Mojo!",
@@ -1442,6 +1443,8 @@ seffect_remove_curse(struct obj **sobjp)
} }
} }
if (sblessed || wornmask || obj->otyp == LOADSTONE if (sblessed || wornmask || obj->otyp == LOADSTONE
/* this treats an in-use leash as a worn item but does not
do the same for lit lamp/candle [seems inconsistent] */
|| (obj->otyp == LEASH && obj->leashmon)) { || (obj->otyp == LEASH && obj->leashmon)) {
/* water price varies by curse/bless status */ /* water price varies by curse/bless status */
boolean shop_h2o = (obj->unpaid && obj->otyp == POT_WATER); boolean shop_h2o = (obj->unpaid && obj->otyp == POT_WATER);
@@ -1728,8 +1731,8 @@ seffect_amnesia(struct obj **sobjp)
if (Hallucination) /* Ommmmmm! */ if (Hallucination) /* Ommmmmm! */
Your("mind releases itself from mundane concerns."); Your("mind releases itself from mundane concerns.");
else if (!strncmpi(gp.plname, "Maud", 4)) else if (!strncmpi(gp.plname, "Maud", 4))
pline( pline("As your mind turns inward on itself,"
"As your mind turns inward on itself, you forget everything else."); " you forget everything else.");
else if (rn2(2)) else if (rn2(2))
pline("Who was that Maud person anyway?"); pline("Who was that Maud person anyway?");
else else
@@ -2809,7 +2812,8 @@ do_genocide(
which = "all "; which = "all ";
if (Hallucination) { if (Hallucination) {
if (Upolyd) if (Upolyd)
Strcpy(buf, pmname(gy.youmonst.data, flags.female ? FEMALE : MALE)); Strcpy(buf, pmname(gy.youmonst.data,
flags.female ? FEMALE : MALE));
else { else {
Strcpy(buf, (flags.female && gu.urole.name.f) ? gu.urole.name.f Strcpy(buf, (flags.female && gu.urole.name.f) ? gu.urole.name.f
: gu.urole.name.m); : gu.urole.name.m);
@@ -2944,8 +2948,8 @@ unpunish(void)
setworn((struct obj *) 0, W_BALL); /* sets 'uball' to Null */ setworn((struct obj *) 0, W_BALL); /* sets 'uball' to Null */
} }
/* Prompt the player to create a stinking cloud and then create it if they give /* prompt the player to create a stinking cloud and then create it if they
* a location. */ give a location */
static void static void
do_stinking_cloud(struct obj *sobj, boolean mention_stinking) do_stinking_cloud(struct obj *sobj, boolean mention_stinking)
{ {