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

comment formatting

Browse Source 
Fix a few mis-indented comments I stumbled across.
This commit is contained in:
PatR
2018-02-17 01:58:14 -08:00
parent 1eb5919a85
commit 544b9015ff
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cmd.c
+3 -3
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 cmd.c $NHDT-Date: 1513130017 2017/12/13 01:53:37 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.277 $ */ /* NetHack 3.6 cmd.c $NHDT-Date: 1518861485 2018/02/17 09:58:05 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.278 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -2767,7 +2767,7 @@ int final;
if (!u.uconduct.food) if (!u.uconduct.food)
enl_msg(You_, "have gone", "went", " without food", ""); enl_msg(You_, "have gone", "went", " without food", "");
/* But beverages are okay */ /* but beverages are okay */
else if (!u.uconduct.unvegan) else if (!u.uconduct.unvegan)
you_have_X("followed a strict vegan diet"); you_have_X("followed a strict vegan diet");
else if (!u.uconduct.unvegetarian) else if (!u.uconduct.unvegetarian)
@@ -4246,7 +4246,7 @@ register char *cmd;
} else if (*cmd == ' ' && !flags.rest_on_space) { } else if (*cmd == ' ' && !flags.rest_on_space) {
bad_command = TRUE; /* skip cmdlist[] loop */ bad_command = TRUE; /* skip cmdlist[] loop */
/* handle all other commands */ /* handle all other commands */
} else { } else {
register const struct ext_func_tab *tlist; register const struct ext_func_tab *tlist;
int res, NDECL((*func)); int res, NDECL((*func));
src/hack.c
+10 -11
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 hack.c $NHDT-Date: 1512771130 2017/12/08 22:12:10 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.181 $ */ /* NetHack 3.6 hack.c $NHDT-Date: 1518861490 2018/02/17 09:58:10 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.182 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1614,9 +1614,9 @@ domove()
newsym(x, y); newsym(x, y);
glyph = glyph_at(x, y); /* might have just changed */ glyph = glyph_at(x, y); /* might have just changed */
if (boulder) if (boulder) {
Strcpy(buf, ansimpleoname(boulder)); Strcpy(buf, ansimpleoname(boulder));
else if (Underwater && !is_pool(x, y)) } else if (Underwater && !is_pool(x, y)) {
/* Underwater, targetting non-water; the map just shows blank /* Underwater, targetting non-water; the map just shows blank
because you don't see remembered terrain while underwater; because you don't see remembered terrain while underwater;
although the hero can attack an adjacent monster this way, although the hero can attack an adjacent monster this way,
@@ -1624,21 +1624,20 @@ domove()
Sprintf(buf, (Is_waterlevel(&u.uz) && levl[x][y].typ == AIR) Sprintf(buf, (Is_waterlevel(&u.uz) && levl[x][y].typ == AIR)
? "an air bubble" ? "an air bubble"
: "nothing"); : "nothing");
else if (solid) } else if (solid) {
/* glyph might indicate unseen terrain if hero is blind; /* glyph might indicate unseen terrain if hero is blind;
unlike searching, this won't reveal what that terrain is unlike searching, this won't reveal what that terrain is
(except for solid rock, where the glyph would otherwise (except for solid rock, where the glyph would otherwise
yield ludicrous "dark part of a room") */ yield ludicrous "dark part of a room") */
Strcpy(buf, Strcpy(buf, (levl[x][y].typ == STONE) ? "solid rock"
(levl[x][y].typ == STONE) : glyph_is_cmap(glyph)
? "solid rock"
: glyph_is_cmap(glyph)
? the(defsyms[glyph_to_cmap(glyph)].explanation) ? the(defsyms[glyph_to_cmap(glyph)].explanation)
: (const char *) "an unknown obstacle"); : (const char *) "an unknown obstacle");
/* note: 'solid' is misleadingly named and catches pools /* note: 'solid' is misleadingly named and catches pools
of water and lava as well as rock and walls */ of water and lava as well as rock and walls */
else } else {
Strcpy(buf, "thin air"); Strcpy(buf, "thin air");
}
You("%s%s %s.", You("%s%s %s.",
!(boulder || solid) ? "" : !explo ? "harmlessly " : "futilely ", !(boulder || solid) ? "" : !explo ? "harmlessly " : "futilely ",
explo ? "explode at" : "attack", buf); explo ? "explode at" : "attack", buf);