… | |
… | |
373 | return at; |
373 | return at; |
374 | } |
374 | } |
375 | } |
375 | } |
376 | else |
376 | else |
377 | { |
377 | { |
378 | if (!strcasecmp (t->item->clone.name, name)) |
378 | if (t->item && !strcasecmp (t->item->clone.name, name)) |
379 | return t->item; |
379 | return t->item; |
380 | } |
380 | } |
381 | |
381 | |
382 | if (t->next_yes) |
382 | if (t->next_yes) |
383 | { |
383 | { |
… | |
… | |
650 | for (fl = get_formulalist (1); fl; fl = fl->next) |
650 | for (fl = get_formulalist (1); fl; fl = fl->next) |
651 | number++; |
651 | number++; |
652 | |
652 | |
653 | /* now, randomly choose one */ |
653 | /* now, randomly choose one */ |
654 | if (number > 0) |
654 | if (number > 0) |
655 | roll = RANDOM () % number; |
655 | roll = rndm (number); |
656 | |
656 | |
657 | fl = get_formulalist (1); |
657 | fl = get_formulalist (1); |
658 | while (roll && fl) |
658 | while (roll && fl) |
659 | { |
659 | { |
660 | if (fl->next) |
660 | if (fl->next) |
… | |
… | |
683 | if ((fl = get_random_recipelist ()) == NULL) |
683 | if ((fl = get_random_recipelist ()) == NULL) |
684 | return rp; |
684 | return rp; |
685 | |
685 | |
686 | if (fl->total_chance > 0) |
686 | if (fl->total_chance > 0) |
687 | { |
687 | { |
688 | r = RANDOM () % fl->total_chance; |
688 | r = rndm (fl->total_chance); |
689 | for (rp = fl->items; rp; rp = rp->next) |
689 | for (rp = fl->items; rp; rp = rp->next) |
690 | { |
690 | { |
691 | r -= rp->chance; |
691 | r -= rp->chance; |
692 | if (r < 0) |
692 | if (r < 0) |
693 | break; |
693 | break; |