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

Split trap note choosing into separate function

Browse Source
This commit is contained in:
Pasi Kallinen
2022-04-26 14:00:09 +03:00
parent 36af5a9a63
commit 99efeafec7
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/trap.c
View File

@@ -38,6 +38,7 @@ static int trapeffect_vibrating_square(struct monst *, struct trap *,
unsigned); unsigned);
static int trapeffect_selector(struct monst *, struct trap *, unsigned); static int trapeffect_selector(struct monst *, struct trap *, unsigned);
static char *trapnote(struct trap *, boolean); static char *trapnote(struct trap *, boolean);
static int choose_trapnote(struct trap *);
static int steedintrap(struct trap *, struct obj *); static int steedintrap(struct trap *, struct obj *);
static void launch_drop_spot(struct obj *, xchar, xchar); static void launch_drop_spot(struct obj *, xchar, xchar);
static boolean find_random_launch_coord(struct trap *, coord *); static boolean find_random_launch_coord(struct trap *, coord *);
@@ -385,23 +386,9 @@ maketrap(int x, int y, int typ)
ttmp->ttyp = typ; ttmp->ttyp = typ;
switch (typ) { switch (typ) {
case SQKY_BOARD: { case SQKY_BOARD:
int tavail[12], tpick[12], tcnt = 0, k; ttmp->tnote = choose_trapnote(ttmp);
struct trap *t;
for (k = 0; k < 12; ++k)
tavail[k] = tpick[k] = 0;
for (t = g.ftrap; t; t = t->ntrap)
if (t->ttyp == SQKY_BOARD && t != ttmp)
tavail[t->tnote] = 1;
/* now populate tpick[] with the available indices */
for (k = 0; k < 12; ++k)
if (tavail[k] == 0)
tpick[tcnt++] = k;
/* choose an unused note; if all are in use, pick a random one */
ttmp->tnote = (short) ((tcnt > 0) ? tpick[rn2(tcnt)] : rn2(12));
break; break;
}
case STATUE_TRAP: { /* create a "living" statue */ case STATUE_TRAP: { /* create a "living" statue */
struct monst *mtmp; struct monst *mtmp;
struct obj *otmp, *statue; struct obj *otmp, *statue;
@@ -2548,6 +2535,27 @@ trapnote(struct trap* trap, boolean noprefix)
return strcat(tnbuf, tn); return strcat(tnbuf, tn);
} }
/* choose a note not used by any trap on current level,
ignoring ttmp; if all are in use, pick a random one */
static int
choose_trapnote(struct trap *ttmp)
{
int tavail[12], tpick[12], tcnt = 0, k;
struct trap *t;
for (k = 0; k < 12; ++k)
tavail[k] = tpick[k] = 0;
for (t = g.ftrap; t; t = t->ntrap)
if (t->ttyp == SQKY_BOARD && t != ttmp)
tavail[t->tnote] = 1;
/* now populate tpick[] with the available indices */
for (k = 0; k < 12; ++k)
if (tavail[k] == 0)
tpick[tcnt++] = k;
/* choose an unused note; if all are in use, pick a random one */
return ((tcnt > 0) ? tpick[rn2(tcnt)] : rn2(12));
}
static int static int
steedintrap(struct trap* trap, struct obj* otmp) steedintrap(struct trap* trap, struct obj* otmp)
{ {