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

formatting fixup (1 of 2)

Browse Source 
Replace instances of strings split across lines which rely on C89/C90
implicit concatenation of string literals to splice them together
with single strings that are outdented relative to the code that uses
them.  It's uglier but it won't break compile for pre-ANSI compilers.

This covers many files in src/ that only have one or two such split
strings.  There are several more files which have three or more.  Those
will eventually be '(2 of 2)'.

Noticed along the way:  the fake mail message/subject
  Report bugs to devteam@nethack.org.
wasn't using its format string of "Report bugs to %s.", so would have
just shown our email address.  Doesn't anybody enable fake mail anymore?

I modified that format to enclose the address within angle brackets and
made a similar change for the 'contact' choice of the '?' command.
This commit is contained in:
PatR
2015-07-12 19:35:06 -07:00
parent f05f716dbc
commit 2b2ee0fbab
24 changed files with 160 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/engrave.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 engrave.c $NHDT-Date: 1432512768 2015/05/25 00:12:48 $ $NHDT-Branch: master $:$NHDT-Revision: 1.56 $ */
/* NetHack 3.6 engrave.c $NHDT-Date: 1436753512 2015/07/13 02:11:52 $ $NHDT-Branch: master $:$NHDT-Revision: 1.57 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -169,9 +169,10 @@ int x, y;
boolean up, check_pit;
{
You("can't reach the %s.",
up ? ceiling(x, y) : (check_pit && can_reach_floor(FALSE))
? "bottom of the pit"
: surface(x, y));
up ? ceiling(x, y)
: (check_pit && can_reach_floor(FALSE))
? "bottom of the pit"
: surface(x, y));
}
const char *
@@ -753,11 +754,11 @@ doengrave()
IS_GRAVE(levl[u.ux][u.uy].typ)
? "Chips fly out from the headstone."
: is_ice(u.ux, u.uy)
? "Ice chips fly up from the ice surface!"
: (level.locations[u.ux][u.uy].typ
== DRAWBRIDGE_DOWN)
? "Splinters fly up from the bridge."
: "Gravel flies up from the floor.");
? "Ice chips fly up from the ice surface!"
: (level.locations[u.ux][u.uy].typ
== DRAWBRIDGE_DOWN)
? "Splinters fly up from the bridge."
: "Gravel flies up from the floor.");
else
Strcpy(post_engr_text, "You hear drilling!");
break;
@@ -905,8 +906,8 @@ doengrave()
pline("%s %sturns to dust.", The(xname(otmp)),
Blind ? "" : "glows violently, then ");
if (!IS_GRAVE(levl[u.ux][u.uy].typ))
You("are not going to get anywhere trying to write in the %s "
"with your dust.",
You(
"are not going to get anywhere trying to write in the %s with your dust.",
is_ice(u.ux, u.uy) ? "frost" : "dust");
useup(otmp);
otmp = 0; /* wand is now gone */
@@ -947,11 +948,11 @@ doengrave()
|| (oep->engr_type == MARK)) {
if (!Blind) {
You("wipe out the message that was %s here.",
((oep->engr_type == DUST)
? "written in the dust"
: ((oep->engr_type == ENGR_BLOOD)
? "scrawled in blood"
: "written")));
(oep->engr_type == DUST)
? "written in the dust"
: (oep->engr_type == ENGR_BLOOD)
? "scrawled in blood"
: "written");
del_engr(oep);
oep = (struct engr *) 0;
} else
@@ -1102,10 +1103,9 @@ doengrave()
case BURN:
multi = -(len / 10);
if (multi)
nomovemsg =
is_ice(u.ux, u.uy)
? "You finish melting your message into the ice."
: "You finish burning your message into the floor.";
nomovemsg = is_ice(u.ux, u.uy)
? "You finish melting your message into the ice."
: "You finish burning your message into the floor.";
break;
case MARK:
multi = -(len / 10);