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

avoid mkclass() infinite loop (trunk only)

Browse Source 
Back on Feb 28, I committed a patch to prevent the special level
loader from generating mail daemons for levels which specified random
demons.  It had a pair of copy+paste mistakes that could result in
mkclass() looping forever.  It was looking at the same monster every
time and if that monster was one which mustn't be generated, it would
just keep repeating.
This commit is contained in:
nethack.rankin
2011-04-21 00:29:26 +00:00
parent cc03c15978
commit 95f5e029d8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/makemon.c
View File

@@ -1430,7 +1430,7 @@ int spc;
* order of strength.
*/
for(num = rnd(num); num > 0; first++)
if (mk_gen_ok(last, G_GONE, mask)) {
if (mk_gen_ok(first, G_GONE, mask)) {
/* skew towards lower value monsters at lower exp. levels */
num -= mons[first].geno & G_FREQ;
if (num && adj_lev(&mons[first]) > (u.ulevel*2)) {
@@ -1465,7 +1465,7 @@ int class;
if (!num) return NON_PM;
for (num = rnd(num); num > 0; first++)
if (mk_gen_ok(last, G_GENOD, (G_NOGEN|G_UNIQ)))
if (mk_gen_ok(first, G_GENOD, (G_NOGEN|G_UNIQ)))
num -= mons[first].geno & G_FREQ;
first--; /* correct an off-by-one error */