]> granicus.if.org Git - nethack/commitdiff
Check for 100 fruits *after* checking to see if we can reuse a fruit name
authorarromdee <arromdee>
Mon, 12 Dec 2011 02:07:43 +0000 (02:07 +0000)
committerarromdee <arromdee>
Mon, 12 Dec 2011 02:07:43 +0000 (02:07 +0000)
that never had any fruits created.

src/options.c

index d806fa1d71645071084a6ecf4a14aecd4744978b..ac5c9517e3d77f242ac5b101271f3ec55350c367 100644 (file)
@@ -1696,17 +1696,16 @@ boolean tinitial, tfrom_file;
                            break;
                        num++;
                    }
-                   if (num >= 100) {
-                       pline("Doing that so many times isn't very fruitful.");
-                       return;
-                   }
                    if (!flags.made_fruit) {
                        for(forig=ffruit; forig; forig=forig->nextf) {
                            if (!strcmp(pl_fruit, forig->fname)) {
                                break;
                            }
                        }
-                       
+                   }
+                   if (!forig && num >= 100) {
+                       pline("Doing that so many times isn't very fruitful.");
+                       return;
                    }
                }
 goodfruit: