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

formatting: src/a*.c - d*.c continuation lines

Browse Source 
Mostly && and || at end of the first half of a continued line rather
than at the start of the second half.  The automated reformat got
confused by comments in the midst of such lines.
  foo ||
  bar
was converted to
  foo
  || bar
but
  foo ||
  /* comment */
  bar
stayed as is.

Some excluded code [#if 0] was also manually reformatted, but this is
mainly stuff that can be found via regexp '[&|?:][ \t]*$' (with a lot
of false hits for labels whose colon ends their line).
This commit is contained in:
PatR
2015-10-19 17:32:21 -07:00
parent 2c20805b16
commit 3986546325
12 changed files with 272 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/display.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 display.c $NHDT-Date: 1434450195 2015/06/16 10:23:15 $ $NHDT-Branch: master $:$NHDT-Revision: 1.64 $ */
/* NetHack 3.6 display.c $NHDT-Date: 1445301119 2015/10/20 00:31:59 $ $NHDT-Branch: master $:$NHDT-Revision: 1.76 $ */
/* Copyright (c) Dean Luick, with acknowledgements to Kevin Darcy */
/* and Dave Cohrs, 1990. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1741,8 +1741,8 @@ xchar x, y;
if (lev->typ == CORR && idx == S_litcorr)
idx = S_corr;
else if (idx == S_room)
idx = (flags.dark_room && iflags.use_color) ?
(DARKROOMSYM) : S_stone;
idx = (flags.dark_room && iflags.use_color)
? DARKROOMSYM : S_stone;
}
if (idx != S_room)
@@ -2195,19 +2195,19 @@ struct rm *lev;
break;
case WM_T_BL:
#if 0 /* older method, fixed */
if (only(seenv, SV4|SV5)) {
col = T_tlcorn;
} else if ((seenv & (SV0|SV1|SV2)) &&
only(seenv, SV0|SV1|SV2|SV6|SV7)) {
col = T_hwall;
} else if (seenv & SV3 ||
((seenv & (SV0|SV1|SV2)) && (seenv & (SV4|SV5)))) {
col = T_tdwall;
} else {
if (seenv != SV6)
t_warn(lev);
col = T_stone;
}
if (only(seenv, SV4|SV5)) {
col = T_tlcorn;
} else if ((seenv & (SV0|SV1|SV2))
&& only(seenv, SV0|SV1|SV2|SV6|SV7)) {
col = T_hwall;
} else if ((seenv & SV3)
|| ((seenv & (SV0|SV1|SV2)) && (seenv & (SV4|SV5)))) {
col = T_tdwall;
} else {
if (seenv != SV6)
t_warn(lev);
col = T_stone;
}
#endif /* 0 */
if (only(seenv, SV4 | SV5))
col = T_tlcorn;
@@ -2221,19 +2221,19 @@ struct rm *lev;
break;
case WM_T_BR:
#if 0 /* older method, fixed */
if (only(seenv, SV5|SV6)) {
col = T_trcorn;
} else if ((seenv & (SV0|SV1|SV2)) &&
only(seenv, SV0|SV1|SV2|SV3|SV4)) {
col = T_hwall;
} else if (seenv & SV7 ||
((seenv & (SV0|SV1|SV2)) && (seenv & (SV5|SV6)))) {
col = T_tdwall;
} else {
if (seenv != SV4)
t_warn(lev);
col = T_stone;
}
if (only(seenv, SV5|SV6)) {
col = T_trcorn;
} else if ((seenv & (SV0|SV1|SV2))
&& only(seenv, SV0|SV1|SV2|SV3|SV4)) {
col = T_hwall;
} else if ((seenv & SV7)
|| ((seenv & (SV0|SV1|SV2)) && (seenv & (SV5|SV6)))) {
col = T_tdwall;
} else {
if (seenv != SV4)
t_warn(lev);
col = T_stone;
}
#endif /* 0 */
if (only(seenv, SV5 | SV6))
col = T_trcorn;