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

formatting fixups

Browse Source 
Presence of trailing whitespace pointed out so post-reformatting
non-conformant formatting.
This commit is contained in:
PatR
2016-04-20 16:43:33 -07:00
parent 1cad2bd783
commit 573fff466e
2 changed files with 45 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detect.c
+4 -7
View File
@@ -1463,16 +1463,13 @@ dosearch()
void void
warnreveal() warnreveal()
{ {
xchar x, y; int x, y;
struct monst *mtmp; struct monst *mtmp;
for (x = u.ux - 1; x < u.ux + 2; x++) for (x = u.ux - 1; x <= u.ux + 1; x++)
for (y = u.uy - 1; y < u.uy + 2; y++) { for (y = u.uy - 1; y <= u.uy + 1; y++) {
if (!isok(x, y)) if (!isok(x, y) || (x == u.ux && y == u.uy))
continue; continue;
if (x == u.ux && y == u.uy)
continue;
if ((mtmp = m_at(x, y)) != 0 if ((mtmp = m_at(x, y)) != 0
&& warning_of(mtmp) && mtmp->mundetected) && warning_of(mtmp) && mtmp->mundetected)
(void) mfind0(mtmp, 1); /* via_warning */ (void) mfind0(mtmp, 1); /* via_warning */
src/shk.c
+11 -15
View File
@@ -81,7 +81,7 @@ STATIC_DCL const char *FDECL(cad, (BOOLEAN_P));
obj->quan <= bp->bquan obj->quan <= bp->bquan
*/ */
static const char *angrytexts[] = {"quite upset", "ticked off", "furious"}; static const char *angrytexts[] = { "quite upset", "ticked off", "furious" };
/* /*
* Transfer money from inventory to monster when paying * Transfer money from inventory to monster when paying
@@ -603,7 +603,8 @@ char *enterstring;
shtypes[rt - SHOPBASE].name); shtypes[rt - SHOPBASE].name);
} else if (eshkp->robbed) { } else if (eshkp->robbed) {
if (!Deaf) if (!Deaf)
pline("%s mutters imprecations against shoplifters.", shkname(shkp)); pline("%s mutters imprecations against shoplifters.",
shkname(shkp));
else else
pline("%s is combing through %s inventory list.", pline("%s is combing through %s inventory list.",
Shknam(shkp), Shknam(shkp),
@@ -611,8 +612,8 @@ char *enterstring;
} else { } else {
if (!Deaf && !muteshk(shkp)) if (!Deaf && !muteshk(shkp))
verbalize("%s, %s! Welcome%s to %s %s!", Hello(shkp), plname, verbalize("%s, %s! Welcome%s to %s %s!", Hello(shkp), plname,
eshkp->visitct++ ? " again" : "", s_suffix(shkname(shkp)), eshkp->visitct++ ? " again" : "",
shtypes[rt - SHOPBASE].name); s_suffix(shkname(shkp)), shtypes[rt - SHOPBASE].name);
else else
You("enter %s %s%s!", You("enter %s %s%s!",
s_suffix(shkname(shkp)), s_suffix(shkname(shkp)),
@@ -3973,10 +3974,8 @@ boolean cant_mollify;
dugwall ? "shop" : "door"); dugwall ? "shop" : "door");
else else
pline("%s is %s that you decided to %s %s %s!", pline("%s is %s that you decided to %s %s %s!",
Shknam(shkp), Shknam(shkp), angrytexts[rn2(SIZE(angrytexts))],
angrytexts[rn2(SIZE(angrytexts))], dmgstr, mhis(shkp), dugwall ? "shop" : "door");
dmgstr, mhis(shkp),
dugwall ? "shop" : "door");
} else { } else {
if (!Deaf) { if (!Deaf) {
pline("%s shouts:", shkname(shkp)); pline("%s shouts:", shkname(shkp));
@@ -3984,11 +3983,8 @@ boolean cant_mollify;
dugwall ? "shop" : "door"); dugwall ? "shop" : "door");
} else { } else {
pline("%s is %s that someone decided to %s %s %s!", pline("%s is %s that someone decided to %s %s %s!",
Shknam(shkp), Shknam(shkp), angrytexts[rn2(SIZE(angrytexts))],
angrytexts[rn2(SIZE(angrytexts))], dmgstr, mhis(shkp), dugwall ? "shop" : "door");
dmgstr,
mhis(shkp),
dugwall ? "shop" : "door");
} }
} }
hot_pursuit(shkp); hot_pursuit(shkp);
@@ -4127,6 +4123,7 @@ long cost;
{ {
if (!rn2(3)) { if (!rn2(3)) {
register int o, choice = rn2(5); register int o, choice = rn2(5);
if (choice == 0) if (choice == 0)
choice = (cost < 100L ? 1 : cost < 500L ? 2 : 3); choice = (cost < 100L ? 1 : cost < 500L ? 2 : 3);
switch (choice) { switch (choice) {
@@ -4211,7 +4208,6 @@ struct monst *shkp;
else else
pline("%s taps you on the %s.", pline("%s taps you on the %s.",
Shknam(shkp), body_part(ARM)); Shknam(shkp), body_part(ARM));
} }
} else if (eshk->billct) { } else if (eshk->billct) {
register long total = addupbill(shkp) + eshk->debit; register long total = addupbill(shkp) + eshk->debit;
@@ -4232,7 +4228,7 @@ struct monst *shkp;
pline("%s %s about a recent robbery.", pline("%s %s about a recent robbery.",
Shknam(shkp), Shknam(shkp),
(!Deaf && !muteshk(shkp)) ? "complains" : "indicates concern"); (!Deaf && !muteshk(shkp)) ? "complains" : "indicates concern");
} else if ((shkmoney = money_cnt(shkp->minvent)) < 50) { } else if ((shkmoney = money_cnt(shkp->minvent)) < 50L) {
pline("%s %s that business is bad.", pline("%s %s that business is bad.",
shkname(shkp), shkname(shkp),
(!Deaf && !muteshk(shkp)) ? "complains" : "indicates"); (!Deaf && !muteshk(shkp)) ? "complains" : "indicates");