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

12
src/display.c
View File

@@ -1742,7 +1742,8 @@ clear_glyph_buffer(void)
#ifndef UNBUFFERED_GLYPHINFO
nul_gbuf.gnew = (giptr->ttychar != nul_gbuf.glyphinfo.ttychar
|| giptr->gm.color != nul_gbuf.glyphinfo.gm.color
|| giptr->gm.glyphflags != nul_gbuf.glyphinfo.gm.glyphflags
|| giptr->gm.glyphflags
!= nul_gbuf.glyphinfo.gm.glyphflags
|| giptr->gm.tileidx != nul_gbuf.glyphinfo.gm.tileidx)
#else
nul_gbuf.gnew = (giptr->glyphinfo.ttychar != ' '
@@ -2029,12 +2030,13 @@ back_to_glyph(xchar x, xchar y)
static int
swallow_to_glyph(int mnum, int loc)
{
int m_3 = what_mon(mnum, rn2_on_display_rng) << 3;
if (loc < S_sw_tl || S_sw_br < loc) {
impossible("swallow_to_glyph: bad swallow location");
loc = S_sw_br;
}
return ((int) (what_mon(mnum, rn2_on_display_rng) << 3) |
(loc - S_sw_tl)) + GLYPH_SWALLOW_OFF;
return (m_3 | (loc - S_sw_tl)) + GLYPH_SWALLOW_OFF;
}
/*
@@ -2327,8 +2329,8 @@ cmap_to_roguecolor(int cmap)
gm_levelchange called when the player has gone to a new level.
gm_symchange called if someone has interactively altered the symbols for
the game, most likely at the options menu.
gm_symchange called if someone has interactively altered the symbols
for the game, most likely at the options menu.
gm_optionchange The game settings have been toggled and some of them
are configured to trigger a reset_glyphmap()