some reformatting

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

View File

@@ -82,8 +82,8 @@ door_into_nonjoined(xchar x, xchar y)
continue;
/* Is this connecting to a room that doesn't want joining? */
if (levl[tx][ty].roomno >= ROOMOFFSET &&
!g.rooms[levl[tx][ty].roomno - ROOMOFFSET].needjoining) {
if (levl[tx][ty].roomno >= ROOMOFFSET
&& !g.rooms[levl[tx][ty].roomno - ROOMOFFSET].needjoining) {
return TRUE;
}
}
@@ -1610,7 +1610,7 @@ mktrap(int num, int mktrapflags, struct mkroom *croom, coord *tm)
void
mkstairs(xchar x, xchar y,
char up, /* [why 'char' when usage is boolean?] */
char up, /* [why 'char' when usage is boolean?] */
struct mkroom *croom UNUSED)
{
d_level dest;