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

some reformatting

Browse Source 
Replace some
  (foo &&
   bar)
that had crept back into the code with
  (foo
   && bar)
to match the reformatting which took place before 3.6.0.  There are a
couple of lines ending in '||' still present but they look intentional.
isaac64.c has some trailing '|' bit operators that could/should be
moved to the start of the next line but I didn't touch that file.

While in the affected files, I tried to shorten most overly wide lines
(the right margin is supposed to at column 78 and there are quite a
few lines which are 79 characters long, but I left most of those
rather than introduce new line splits).  Also replace a handful of
tabs with spaces.  I was a little surprised not find any trailing
spaces (in the dozen or so files being updated).  I didn't look for
trailing arithmetic or '?'/':' operators which aught to be moved to
the start of the next line.
This commit is contained in:
PatR
2021-12-14 07:43:40 -08:00
parent d0197bd3e7
commit 495cda17b7
13 changed files with 212 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/apply.c
View File

@@ -980,8 +980,8 @@ use_mirror(struct obj *obj)
if (vis)
pline("%s confuses itself!", Monnam(mtmp));
mtmp->mconf = 1;
} else if (monable &&
(mlet == S_NYMPH || mtmp->data == &mons[PM_AMOROUS_DEMON])) {
} else if (monable && (mlet == S_NYMPH
|| mtmp->data == &mons[PM_AMOROUS_DEMON])) {
if (vis) {
char buf[BUFSZ]; /* "She" or "He" */
@@ -1546,8 +1546,8 @@ light_cocktail(struct obj **optr)
*optr = obj;
}
/* getobj callback for object to be rubbed - not selecting a secondary object to
* rub on a gray stone or rub jelly on */
/* getobj callback for object to be rubbed - not selecting a secondary object
to rub on a gray stone or rub jelly on */
static int
rub_ok(struct obj *obj)
{
@@ -3630,12 +3630,12 @@ do_break_wand(struct obj *obj)
? (char *) 0
: "Some holes are quickly filled with %s!");
fillmsg = TRUE;
} else
digactualhole(x, y, BY_OBJECT, (rn2(obj->spe) < 3
|| (!Can_dig_down(&u.uz)
&& !levl[x][y].candig))
? PIT
: HOLE);
} else {
digactualhole(x, y, BY_OBJECT,
(rn2(obj->spe) < 3
|| (!Can_dig_down(&u.uz)
&& !levl[x][y].candig)) ? PIT : HOLE);
}
}
continue;
} else if (obj->otyp == WAN_CREATE_MONSTER) {