--- deliantra/server/random_maps/standalone.C 2006/12/30 18:45:28 1.11 +++ deliantra/server/random_maps/standalone.C 2006/12/31 19:02:24 1.12 @@ -1,3 +1,4 @@ + /* CrossFire, A Multiplayer game for X-windows @@ -90,38 +91,38 @@ switch (op->type) { - case SHOP_FLOOR: - if (!op->has_random_items ()) - return 0; - do - { - i = 10; /* let's give it 10 tries */ - while ((tmp = generate_treasure (op->randomitems, op->stats.exp ? op->stats.exp : 5)) == NULL && --i); - if (tmp == NULL) - return 0; - if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) - { - tmp->destroy (); - tmp = NULL; - } - } - while (!tmp); - - tmp->x = op->x, tmp->y = op->y; - SET_FLAG (tmp, FLAG_UNPAID); - insert_ob_in_map (tmp, op->map, NULL, 0); - CLEAR_FLAG (op, FLAG_AUTO_APPLY); - identify (tmp); - break; - - case TREASURE: - if (op->has_random_items ()) - while ((op->stats.hp--) > 0) - create_treasure (op->randomitems, op, GT_ENVIRONMENT, - op->stats.exp ? op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0); - op->remove (); - op->destroy (); - break; + case SHOP_FLOOR: + if (!op->has_random_items ()) + return 0; + do + { + i = 10; /* let's give it 10 tries */ + while ((tmp = generate_treasure (op->randomitems, op->stats.exp ? op->stats.exp : 5)) == NULL && --i); + if (tmp == NULL) + return 0; + if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) + { + tmp->destroy (); + tmp = NULL; + } + } + while (!tmp); + + tmp->x = op->x, tmp->y = op->y; + SET_FLAG (tmp, FLAG_UNPAID); + insert_ob_in_map (tmp, op->map, NULL, 0); + CLEAR_FLAG (op, FLAG_AUTO_APPLY); + identify (tmp); + break; + + case TREASURE: + if (op->has_random_items ()) + while ((op->stats.hp--) > 0) + create_treasure (op->randomitems, op, GT_ENVIRONMENT, + op->stats.exp ? op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0); + op->remove (); + op->destroy (); + break; } return tmp ? 1 : 0;