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

Use RANDOM_CLASS instead of magic number 0 for mksobj_at()

Browse Source
This commit is contained in:
copperwater
2022-05-27 21:42:25 -04:00
parent 5529a9af45
commit 84f4e53fde
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/makemon.c
View File

@@ -1273,7 +1273,7 @@ makemon(
case S_SNAKE: case S_SNAKE:
if (g.in_mklev) if (g.in_mklev)
if (x && y) if (x && y)
(void) mkobj_at(0, x, y, TRUE); (void) mkobj_at(RANDOM_CLASS, x, y, TRUE);
(void) hideunder(mtmp); (void) hideunder(mtmp);
break; break;
case S_LIGHT: case S_LIGHT:

6
src/mklev.c
View File

@@ -635,7 +635,7 @@ makeniche(int trap_type)
(void) mksobj_at(SCR_TELEPORTATION, xx, yy + dy, TRUE, (void) mksobj_at(SCR_TELEPORTATION, xx, yy + dy, TRUE,
FALSE); FALSE);
if (!rn2(3)) if (!rn2(3))
(void) mkobj_at(0, xx, yy + dy, TRUE); (void) mkobj_at(RANDOM_CLASS, xx, yy + dy, TRUE);
} }
} }
return; return;
@@ -833,14 +833,14 @@ fill_ordinary_room(struct mkroom *croom)
skip_nonrogue: skip_nonrogue:
if (!rn2(3) && somexyspace(croom, &pos)) { if (!rn2(3) && somexyspace(croom, &pos)) {
(void) mkobj_at(0, pos.x, pos.y, TRUE); (void) mkobj_at(RANDOM_CLASS, pos.x, pos.y, TRUE);
trycnt = 0; trycnt = 0;
while (!rn2(5)) { while (!rn2(5)) {
if (++trycnt > 100) { if (++trycnt > 100) {
impossible("trycnt overflow4"); impossible("trycnt overflow4");
break; break;
} }
(void) mkobj_at(0, pos.x, pos.y, TRUE); (void) mkobj_at(RANDOM_CLASS, pos.x, pos.y, TRUE);
} }
} }
} }

2
src/mkmaze.c
View File

@@ -1101,7 +1101,7 @@ makemaz(const char *s)
for (x = rn1(8, 11); x; x--) { for (x = rn1(8, 11); x; x--) {
mazexy(&mm); mazexy(&mm);
(void) mkobj_at(rn2(2) ? GEM_CLASS : 0, mm.x, mm.y, TRUE); (void) mkobj_at(rn2(2) ? GEM_CLASS : RANDOM_CLASS, mm.x, mm.y, TRUE);
} }
for (x = rn1(10, 2); x; x--) { for (x = rn1(10, 2); x; x--) {
mazexy(&mm); mazexy(&mm);