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

Unify finding room pos for some features

Browse Source
This commit is contained in:
Pasi Kallinen
2020-02-08 19:47:36 +02:00
parent 0f16a48aaf
commit df137029c0
1 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mklev.c
+23 -20
View File
@@ -10,6 +10,7 @@
/* conversion of result to int is reasonable */ /* conversion of result to int is reasonable */
static void FDECL(mkfount, (int, struct mkroom *)); static void FDECL(mkfount, (int, struct mkroom *));
static boolean FDECL(find_okay_roompos, (struct mkroom *, coord *));
static void FDECL(mksink, (struct mkroom *)); static void FDECL(mksink, (struct mkroom *));
static void FDECL(mkaltar, (struct mkroom *)); static void FDECL(mkaltar, (struct mkroom *));
static void FDECL(mkgrave, (struct mkroom *)); static void FDECL(mkgrave, (struct mkroom *));
@@ -1604,19 +1605,30 @@ struct mkroom *croom;
g.level.flags.nfountains++; g.level.flags.nfountains++;
} }
static boolean
find_okay_roompos(croom, crd)
struct mkroom *croom;
coord *crd;
{
int tryct = 0;
do {
if (++tryct > 200)
return FALSE;
if (!somexy(croom, crd))
return FALSE;
} while (occupied(crd->x, crd->y) || bydoor(crd->x, crd->y));
return TRUE;
}
static void static void
mksink(croom) mksink(croom)
struct mkroom *croom; struct mkroom *croom;
{ {
coord m; coord m;
register int tryct = 0;
do { if (!find_okay_roompos(croom, &m))
if (++tryct > 200) return;
return;
if (!somexy(croom, &m))
return;
} while (occupied(m.x, m.y) || bydoor(m.x, m.y));
/* Put a sink at m.x, m.y */ /* Put a sink at m.x, m.y */
levl[m.x][m.y].typ = SINK; levl[m.x][m.y].typ = SINK;
@@ -1629,18 +1641,13 @@ mkaltar(croom)
struct mkroom *croom; struct mkroom *croom;
{ {
coord m; coord m;
register int tryct = 0;
aligntyp al; aligntyp al;
if (croom->rtype != OROOM) if (croom->rtype != OROOM)
return; return;
do { if (!find_okay_roompos(croom, &m))
if (++tryct > 200) return;
return;
if (!somexy(croom, &m))
return;
} while (occupied(m.x, m.y) || bydoor(m.x, m.y));
/* Put an altar at m.x, m.y */ /* Put an altar at m.x, m.y */
levl[m.x][m.y].typ = ALTAR; levl[m.x][m.y].typ = ALTAR;
@@ -1662,12 +1669,8 @@ struct mkroom *croom;
if (croom->rtype != OROOM) if (croom->rtype != OROOM)
return; return;
do { if (!find_okay_roompos(croom, &m))
if (++tryct > 200) return;
return;
if (!somexy(croom, &m))
return;
} while (occupied(m.x, m.y) || bydoor(m.x, m.y));
/* Put a grave at <m.x,m.y> */ /* Put a grave at <m.x,m.y> */
make_grave(m.x, m.y, dobell ? "Saved by the bell!" : (char *) 0); make_grave(m.x, m.y, dobell ? "Saved by the bell!" : (char *) 0);