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

some reformatting (1 of 4)

Browse Source 
I recently realized that I've been editing sources in a terminal
window that was widened in order to fit curses borders for testing
something or other.  That has resulted in some new wide lines in the
source.  There were lots of old ones too.

This updates some source files to try to achieve the goal of 78
characters or less.  As in the past, I've been inconsistent about
lines with 79 characters.  Lines with 80 or more have been wrapped
or shortened (usually by trimming an end of line comment or removing
redundant parantheses, sometimes just by reducing the indentation
of the continuation portion of an already wrapped line).

I eliminated one instance of warning manipulation for non-constant
format string, and simplified stone_luck() where Ken had a silly
comment about the function argument's name.
This commit is contained in:
PatR
2024-09-05 13:12:11 -07:00
parent 74981d9ff2
commit 50412ba53b
11 changed files with 102 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/allmain.c
View File

@@ -320,7 +320,8 @@ moveloop_core(void)
}
}
if (!svl.level.flags.noautosearch && Searching && gm.multi >= 0)
if (Searching && !svl.level.flags.noautosearch
&& gm.multi >= 0)
(void) dosearch0(1);
if (Warning)
warnreveal();
@@ -751,7 +752,7 @@ newgame(void)
* any artifacts */
u_init();
l_nhcore_init(); /* create a Lua state that lasts until the end of the game */
l_nhcore_init(); /* create a Lua state that lasts until end of game */
reset_glyphmap(gm_newgame);
#ifndef NO_SIGNAL
(void) signal(SIGINT, (SIG_RET_TYPE) done1);
@@ -828,11 +829,12 @@ welcome(boolean new_game) /* false => restoring an old game */
Sprintf(eos(buf), " %s", align_str(u.ualignbase[A_ORIGINAL]));
if (!gu.urole.name.f
&& (new_game
? (gu.urole.allow & ROLE_GENDMASK) == (ROLE_MALE | ROLE_FEMALE)
: currentgend != flags.initgend))
? (gu.urole.allow & ROLE_GENDMASK) == (ROLE_MALE | ROLE_FEMALE)
: currentgend != flags.initgend))
Sprintf(eos(buf), " %s", genders[currentgend].adj);
Sprintf(eos(buf), " %s %s", gu.urace.adj,
(currentgend && gu.urole.name.f) ? gu.urole.name.f : gu.urole.name.m);
(currentgend && gu.urole.name.f) ? gu.urole.name.f
: gu.urole.name.m);
pline(new_game ? "%s %s, welcome to NetHack! You are a%s."
: "%s %s, the%s, welcome back to NetHack!",
@@ -1242,11 +1244,13 @@ dump_enums(void)
objclass_syms_dump,
arti_enum_dump,
};
static const char *const pfx[NUM_ENUM_DUMPS] = { "PM_", "", "",
"", "", "", "",
"", "", "" };
static const char *const pfx[NUM_ENUM_DUMPS] = {
"PM_", "", "", "", "", "", "", "", "", ""
};
/* 0 = dump numerically only, 1 = add 'char' comment */
static const int dumpflgs[NUM_ENUM_DUMPS] = { 0, 0, 0, 0, 0, 1, 1, 0, 0, 0 };
static const int dumpflgs[NUM_ENUM_DUMPS] = {
0, 0, 0, 0, 0, 1, 1, 0, 0, 0
};
static int szd[NUM_ENUM_DUMPS] = { SIZE(monsdump), SIZE(objdump),
SIZE(omdump), SIZE(defsym_cmap_dump),
SIZE(defsym_mon_syms_dump),