--- deliantra/server/common/treasure.C 2007/09/04 05:43:21 1.65 +++ deliantra/server/common/treasure.C 2007/10/16 00:30:24 1.67 @@ -245,7 +245,7 @@ op->expand_tail (); - if (ob_blocked (op, creator->map, creator->x, creator->y)) + if (op->blocked (creator->map, creator->x, creator->y)) op->destroy (); else { @@ -491,23 +491,18 @@ int level_for_item (const object *op, int difficulty) { - int olevel = 0; - if (!op->inv) { LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name); return 0; } - olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2)); + int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.)); if (olevel <= 0) - olevel = rndm (1, MIN (op->inv->level, 1)); - - if (olevel > MAXLEVEL) - olevel = MAXLEVEL; + olevel = rndm (1, op->inv->level); - return olevel; + return min (olevel, MAXLEVEL); } /*