From: PatR Date: Thu, 13 Oct 2016 19:08:06 +0000 (-0700) Subject: more lint and formatting X-Git-Tag: NetHack-3.6.1_RC01~565 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f8f22ea4a0089158b6105b2e5198b8dac9a7e3e;p=nethack more lint and formatting Fix a C89/C90 complaint about a declaration following executable code. The rest is formatting (of stuff I saw rather than systematic fixups). --- diff --git a/src/do_name.c b/src/do_name.c index 6ec045fa8..d494942ce 100644 --- a/src/do_name.c +++ b/src/do_name.c @@ -48,23 +48,26 @@ const char *const gloc_descr[NUM_GLOCS][4] = { { "any monsters", "monster", "next monster", "monsters" }, { "any items", "item", "next object", "objects" }, { "any doors", "door", "next door or doorway", "doors or doorways" }, - { "any unexplored areas", "unexplored area", "unexplored location", "unexplored locations" }, - { "anything interesting", "interesting thing", "anything interesting", "anything interesting" } + { "any unexplored areas", "unexplored area", "unexplored location", + "unexplored locations" }, + { "anything interesting", "interesting thing", "anything interesting", + "anything interesting" } }; void -getpos_help_keyxhelp(tmpwin, k1,k2,gloc) +getpos_help_keyxhelp(tmpwin, k1, k2, gloc) winid tmpwin; const char *k1; const char *k2; int gloc; { char sbuf[BUFSZ]; + Sprintf(sbuf, "Use '%s' or '%s' to %s%s%s.", k1, k2, iflags.getloc_usemenu ? "get a menu of " - : "move the cursor to ", + : "move the cursor to ", gloc_descr[gloc][2 + iflags.getloc_usemenu], iflags.getloc_limitview ? " in view" : ""); putstr(tmpwin, 0, sbuf); @@ -80,10 +83,12 @@ const char *goal; boolean doing_what_is; winid tmpwin = create_nhwindow(NHW_MENU); - Sprintf(sbuf, "Use '%c', '%c', '%c', '%c' to move the cursor to %s.", /* hjkl */ + Sprintf(sbuf, + "Use '%c', '%c', '%c', '%c' to move the cursor to %s.", /* hjkl */ Cmd.move_W, Cmd.move_S, Cmd.move_N, Cmd.move_E, goal); putstr(tmpwin, 0, sbuf); - putstr(tmpwin, 0, "Use 'H', 'J', 'K', 'L' to move the cursor 8 units at a time."); + putstr(tmpwin, 0, + "Use 'H', 'J', 'K', 'L' to move the cursor 8 units at a time."); putstr(tmpwin, 0, "Or enter a background symbol (ex. '<')."); Sprintf(sbuf, "Use '%s' to move the cursor on yourself.", visctrl(Cmd.spkeys[NHKF_GETPOS_SELF])); @@ -119,7 +124,8 @@ const char *goal; Sprintf(sbuf, "Use '%s' to toggle menu listing for possible targets.", visctrl(Cmd.spkeys[NHKF_GETPOS_MENU])); putstr(tmpwin, 0, sbuf); - Sprintf(sbuf, "Use '%s' to toggle limiting possible targets to in view only.", + Sprintf(sbuf, + "Use '%s' to toggle limiting possible targets to in view only.", visctrl(Cmd.spkeys[NHKF_GETPOS_LIMITVIEW])); putstr(tmpwin, 0, sbuf); if (!iflags.terrainmode) { @@ -155,7 +161,7 @@ const char *goal; putstr(tmpwin, 0, sbuf); if (doing_what_is) { Sprintf(sbuf, - " '%s' describe current spot, show 'more info', move to another spot.", + " '%s' describe current spot, show 'more info', move to another spot.", visctrl(Cmd.spkeys[NHKF_GETPOS_PICK_V])); putstr(tmpwin, 0, sbuf); Sprintf(sbuf, diff --git a/src/mkmaze.c b/src/mkmaze.c index 9c6d18715..03d993590 100644 --- a/src/mkmaze.c +++ b/src/mkmaze.c @@ -619,37 +619,38 @@ fixup_special() } boolean -maze_inbounds(x,y) -int x,y; +maze_inbounds(x, y) +int x, y; { return (x >= 2 && y >= 2 - && x < x_maze_max && y < y_maze_max && isok(x,y)); + && x < x_maze_max && y < y_maze_max && isok(x, y)); } void maze_remove_deadends(typ) xchar typ; { - int x,y, dir; + char dirok[4]; + int x, y, dir, idx, idx2, dx, dy, dx2, dy2; + + dirok[0] = 0; /* lint suppression */ for (x = 2; x < x_maze_max; x++) for (y = 2; y < y_maze_max; y++) if (ACCESSIBLE(levl[x][y].typ) && (x % 2) && (y % 2)) { - char dirok[4]; - int idx = 0; - int idx2 = 0; + idx = idx2 = 0; for (dir = 0; dir < 4; dir++) { - int dx = x; - int dy = y; - int dx2 = x; - int dy2 = y; - mz_move(dx,dy, dir); - if (!maze_inbounds(dx,dy)) { + /* note: mz_move() is a macro which modifies + one of its first two parameters */ + dx = dx2 = x; + dy = dy2 = y; + mz_move(dx, dy, dir); + if (!maze_inbounds(dx, dy)) { idx2++; continue; } - mz_move(dx2,dy2, dir); - mz_move(dx2,dy2, dir); - if (!maze_inbounds(dx2,dy2)) { + mz_move(dx2, dy2, dir); + mz_move(dx2, dy2, dir); + if (!maze_inbounds(dx2, dy2)) { idx2++; continue; } @@ -660,10 +661,10 @@ xchar typ; } } if (idx2 >= 3 && idx > 0) { + dx = x; + dy = y; dir = dirok[rn2(idx)]; - int dx = x; - int dy = y; - mz_move(dx,dy, dir); + mz_move(dx, dy, dir); levl[dx][dy].typ = typ; } } @@ -700,17 +701,17 @@ int wallthick; rdy = (y_maze_max / scale); if (level.flags.corrmaze) - for (x = 2; x < (rdx*2); x++) - for (y = 2; y < (rdy*2); y++) + for (x = 2; x < (rdx * 2); x++) + for (y = 2; y < (rdy * 2); y++) levl[x][y].typ = STONE; else - for (x = 2; x <= (rdx*2); x++) - for (y = 2; y <= (rdy*2); y++) + for (x = 2; x <= (rdx * 2); x++) + for (y = 2; y <= (rdy * 2); y++) levl[x][y].typ = ((x % 2) && (y % 2)) ? STONE : HWALL; /* set upper bounds for maze0xy and walkfrom */ - x_maze_max = (rdx*2); - y_maze_max = (rdy*2); + x_maze_max = (rdx * 2); + y_maze_max = (rdy * 2); /* create maze */ maze0xy(&mm); @@ -726,7 +727,7 @@ int wallthick; /* scale maze up if needed */ if (scale > 2) { char tmpmap[COLNO][ROWNO]; - int rx = 1,ry = 1; + int rx = 1, ry = 1; /* back up the existing smaller maze */ for (x = 1; x < x_maze_max; x++) @@ -738,12 +739,14 @@ int wallthick; rx = x = 2; while (rx < x_maze_max) { int mx = (x % 2) ? corrwid - : ((x == 2 || x == ((rdx*2))) ? 1 : wallthick); + : ((x == 2 || x == (rdx * 2)) ? 1 + : wallthick); ry = y = 2; while (ry < y_maze_max) { int dx = 0, dy = 0; int my = (y % 2) ? corrwid - : ((y == 2 || y == ((rdy*2))) ? 1 : wallthick); + : ((y == 2 || y == (rdy * 2)) ? 1 + : wallthick); for (dx = 0; dx < mx; dx++) for (dy = 0; dy < my; dy++) { if (rx+dx >= x_maze_max