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

couple of source formatting bits

Browse Source
This commit is contained in:
PatR
2020-07-01 07:49:38 -07:00
parent 2760dc3f16
commit 3a94f0a9f8
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apply.c
+8 -9
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 apply.c $NHDT-Date: 1582155875 2020/02/19 23:44:35 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.318 $ */ /* NetHack 3.6 apply.c $NHDT-Date: 1593614972 2020/07/01 14:49:32 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.325 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */ /*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1034,9 +1034,9 @@ struct obj **optr;
struct monst *mtmp; struct monst *mtmp;
boolean wakem = FALSE, learno = FALSE, boolean wakem = FALSE, learno = FALSE,
ordinary = (obj->otyp != BELL_OF_OPENING || !obj->spe), ordinary = (obj->otyp != BELL_OF_OPENING || !obj->spe),
invoking = invoking = (obj->otyp == BELL_OF_OPENING
(obj->otyp == BELL_OF_OPENING && invocation_pos(u.ux, u.uy) && invocation_pos(u.ux, u.uy)
&& !On_stairs(u.ux, u.uy)); && !On_stairs(u.ux, u.uy));
You("ring %s.", the(xname(obj))); You("ring %s.", the(xname(obj)));
@@ -3654,11 +3654,10 @@ doapply()
} else if (!ublindf) { } else if (!ublindf) {
Blindf_on(obj); Blindf_on(obj);
} else { } else {
You("are already %s.", ublindf->otyp == TOWEL You("are already %s.",
? "covered by a towel" (ublindf->otyp == TOWEL) ? "covered by a towel"
: ublindf->otyp == BLINDFOLD : (ublindf->otyp == BLINDFOLD) ? "wearing a blindfold"
? "wearing a blindfold" : "wearing lenses");
: "wearing lenses");
} }
break; break;
case CREAM_PIE: case CREAM_PIE:
src/mhitm.c
+2 -2
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 mhitm.c $NHDT-Date: 1593306906 2020/06/28 01:15:06 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.137 $ */ /* NetHack 3.6 mhitm.c $NHDT-Date: 1593614973 2020/07/01 14:49:33 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.138 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2011. */ /*-Copyright (c) Robert Patrick Rankin, 2011. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -984,7 +984,7 @@ int dieroll;
/* artifact_hit updates 'tmp' but doesn't inflict any /* artifact_hit updates 'tmp' but doesn't inflict any
damage; however, it might cause carried items to be damage; however, it might cause carried items to be
destroyed and they might do so */ destroyed and they might do so */
if (DEADMONSTER(mdef)) if (DEADMONSTER(mdef))
return (MM_DEF_DIED return (MM_DEF_DIED
| (grow_up(magr, mdef) ? 0 : MM_AGR_DIED)); | (grow_up(magr, mdef) ? 0 : MM_AGR_DIED));
} }