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

analyzer lint for m[a-k]*.c

Browse Source
This commit is contained in:
PatR
2025-01-19 23:31:26 -08:00
parent 41f6582690
commit f2c4396641
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mklev.c
+8 -7
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 mklev.c $NHDT-Date: 1728168518 2024/10/05 22:48:38 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.191 $ */ /* NetHack 3.7 mklev.c $NHDT-Date: 1737387068 2025/01/20 07:31:08 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.194 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Alex Smith, 2017. */ /*-Copyright (c) Alex Smith, 2017. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -90,7 +90,10 @@ door_into_nonjoined(coordxy x, coordxy y)
} }
staticfn boolean staticfn boolean
finddpos(coord *cc, coordxy xl, coordxy yl, coordxy xh, coordxy yh) finddpos(
coord *cc,
coordxy xl, coordxy yl,
coordxy xh, coordxy yh)
{ {
coordxy x, y; coordxy x, y;
@@ -109,8 +112,8 @@ finddpos(coord *cc, coordxy xl, coordxy yl, coordxy xh, coordxy yh)
if (IS_DOOR(levl[x][y].typ) || levl[x][y].typ == SDOOR) if (IS_DOOR(levl[x][y].typ) || levl[x][y].typ == SDOOR)
goto gotit; goto gotit;
/* cannot find something reasonable -- strange */ /* cannot find something reasonable -- strange */
x = xl; cc->x = xl;
y = yh; cc->y = yh;
return FALSE; return FALSE;
gotit: gotit:
cc->x = x; cc->x = x;
@@ -1535,7 +1538,6 @@ place_branch(
coord m = {0}; coord m = {0};
d_level *dest; d_level *dest;
boolean make_stairs; boolean make_stairs;
struct mkroom *br_room;
/* /*
* Return immediately if there is no branch to make or we have * Return immediately if there is no branch to make or we have
@@ -1546,14 +1548,13 @@ place_branch(
if (!br || gm.made_branch) if (!br || gm.made_branch)
return; return;
nhUse(br_room);
if (!x) { /* find random coordinates for branch */ if (!x) { /* find random coordinates for branch */
/* br_room = find_branch_room(&m); */ /* br_room = find_branch_room(&m); */
(void) find_branch_room(&m); /* sets m via mazexy() or somexy() */ (void) find_branch_room(&m); /* sets m via mazexy() or somexy() */
x = m.x; x = m.x;
y = m.y; y = m.y;
} else { } else {
br_room = pos_to_room(x, y); (void) pos_to_room(x, y);
} }
if (on_level(&br->end1, &u.uz)) { if (on_level(&br->end1, &u.uz)) {
src/mkmaze.c
+1 -2
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 mkmaze.c $NHDT-Date: 1712454188 2024/04/07 01:43:08 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.163 $ */ /* NetHack 3.7 mkmaze.c $NHDT-Date: 1737387068 2025/01/20 07:31:08 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.176 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Pasi Kallinen, 2018. */ /*-Copyright (c) Pasi Kallinen, 2018. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1009,7 +1009,6 @@ create_maze(int corrwid, int wallthick, boolean rmdeadends)
mx = (x % 2) ? corrwid : (x == 2 || x == rdx * 2) ? 1 : wallthick; mx = (x % 2) ? corrwid : (x == 2 || x == rdx * 2) ? 1 : wallthick;
ry = y = 2; ry = y = 2;
while (ry < gy.y_maze_max) { while (ry < gy.y_maze_max) {
dx = dy = 0;
my = (y % 2) ? corrwid my = (y % 2) ? corrwid
: (y == 2 || y == rdy * 2) ? 1 : (y == 2 || y == rdy * 2) ? 1
: wallthick; : wallthick;