… | |
… | |
53 | * subtype 5: arch or race |
53 | * subtype 5: arch or race |
54 | * subtype 7: all three |
54 | * subtype 7: all three |
55 | */ |
55 | */ |
56 | if (op->subtype) |
56 | if (op->subtype) |
57 | { |
57 | { |
58 | arch_flag = (op->subtype & 1); |
58 | arch_flag = op->subtype & 1; |
59 | name_flag = (op->subtype & 2); |
59 | name_flag = op->subtype & 2; |
60 | race_flag = (op->subtype & 4); |
60 | race_flag = op->subtype & 4; |
61 | } |
61 | } |
62 | else |
62 | else |
63 | { |
63 | { |
64 | arch_flag = 1; |
64 | arch_flag = 1; |
65 | name_flag = 1; |
65 | name_flag = 1; |
… | |
… | |
113 | { |
113 | { |
114 | if (operate_altar (altar, &money)) |
114 | if (operate_altar (altar, &money)) |
115 | { |
115 | { |
116 | identify (marked); |
116 | identify (marked); |
117 | |
117 | |
118 | buf.printf ("You have %s.\n\n", long_desc (marked, pl)); |
118 | buf.printf ("You have %s.\r", long_desc (marked, pl)); |
119 | if (marked->msg) |
119 | if (marked->msg) |
120 | buf << "The item has a story:\n\n" << marked->msg << "\n\n"; |
120 | buf << "The item has a story:\r" << marked->msg << "\n\n"; |
121 | |
121 | |
122 | return !money; |
122 | return !money; |
123 | } |
123 | } |
124 | } |
124 | } |
125 | |
125 | |
… | |
… | |
129 | { |
129 | { |
130 | if (operate_altar (altar, &money)) |
130 | if (operate_altar (altar, &money)) |
131 | { |
131 | { |
132 | identify (id); |
132 | identify (id); |
133 | |
133 | |
134 | buf.printf ("You have %s.\n\n", long_desc (id, pl)); |
134 | buf.printf ("You have %s.\r", long_desc (id, pl)); |
135 | if (id->msg) |
135 | if (id->msg) |
136 | buf << "The item has a story:\n\n" << id->msg << "\n\n"; |
136 | buf << "The item has a story:\r" << id->msg << "\n\n"; |
137 | |
137 | |
138 | /* If no more money, might as well quit now */ |
138 | /* If no more money, might as well quit now */ |
139 | if (!money || !check_altar_sacrifice (altar, money)) |
139 | if (!money || !check_altar_sacrifice (altar, money)) |
140 | break; |
140 | break; |
141 | } |
141 | } |
… | |
… | |
995 | item->nrof = give; |
995 | item->nrof = give; |
996 | |
996 | |
997 | if (nr) |
997 | if (nr) |
998 | item->nrof *= nr; |
998 | item->nrof *= nr; |
999 | |
999 | |
1000 | if (is_in_shop (converter)) |
1000 | if (converter->flag [FLAG_PRECIOUS]) |
1001 | SET_FLAG (item, FLAG_UNPAID); |
1001 | SET_FLAG (item, FLAG_UNPAID); |
|
|
1002 | |
|
|
1003 | if (is_in_shop (converter)) |
|
|
1004 | { |
|
|
1005 | // converters on shop floors don't work anymore, bug lets check for it |
|
|
1006 | // and report in case someone still does it. |
|
|
1007 | LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n", |
|
|
1008 | converter->debug_desc ()); |
|
|
1009 | SET_FLAG (item, FLAG_UNPAID); |
|
|
1010 | } |
1002 | else if (price_in < sint64 (item->nrof) * item->value) |
1011 | else if (price_in < sint64 (item->nrof) * item->value) |
1003 | { |
1012 | { |
1004 | LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", |
1013 | LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", |
1005 | &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); |
1014 | &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); |
1006 | /** |
1015 | /** |
… | |
… | |
1153 | { |
1162 | { |
1154 | has_unpaid = true; |
1163 | has_unpaid = true; |
1155 | break; |
1164 | break; |
1156 | } |
1165 | } |
1157 | |
1166 | |
1158 | if (op->type != PLAYER) |
1167 | if (!op->is_player ()) |
1159 | { |
1168 | { |
1160 | /* Remove all the unpaid objects that may be carried here. |
1169 | /* Remove all the unpaid objects that may be carried here. |
1161 | * This could be pets or monsters that are somehow in |
1170 | * This could be pets or monsters that are somehow in |
1162 | * the shop. |
1171 | * the shop. |
1163 | */ |
1172 | */ |
… | |
… | |
1167 | |
1176 | |
1168 | if (QUERY_FLAG (tmp, FLAG_UNPAID)) |
1177 | if (QUERY_FLAG (tmp, FLAG_UNPAID)) |
1169 | { |
1178 | { |
1170 | int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); |
1179 | int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); |
1171 | |
1180 | |
|
|
1181 | if (i >= 0) |
1172 | tmp->remove (); |
1182 | tmp->move (i); |
1173 | |
|
|
1174 | if (i == -1) |
|
|
1175 | i = 0; |
|
|
1176 | |
|
|
1177 | tmp->map = op->map; |
|
|
1178 | tmp->x = op->x + freearr_x[i]; |
|
|
1179 | tmp->y = op->y + freearr_y[i]; |
|
|
1180 | insert_ob_in_map (tmp, op->map, op, 0); |
|
|
1181 | } |
1183 | } |
1182 | } |
1184 | } |
1183 | |
1185 | |
1184 | /* Don't teleport things like spell effects */ |
1186 | /* Don't teleport things like spell effects */ |
1185 | if (QUERY_FLAG (op, FLAG_NO_PICK)) |
1187 | if (QUERY_FLAG (op, FLAG_NO_PICK)) |
… | |
… | |
1196 | if (i != -1) |
1198 | if (i != -1) |
1197 | rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); |
1199 | rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); |
1198 | |
1200 | |
1199 | return 0; |
1201 | return 0; |
1200 | } |
1202 | } |
|
|
1203 | |
1201 | /* Removed code that checked for multipart objects - it appears that |
1204 | /* Removed code that checked for multipart objects - it appears that |
1202 | * the teleport function should be able to handle this just fine. |
1205 | * the teleport function should be able to handle this just fine. |
1203 | */ |
1206 | */ |
1204 | rv = teleport (shop_mat, SHOP_MAT, op); |
1207 | rv = teleport (shop_mat, SHOP_MAT, op); |
1205 | } |
1208 | } |
… | |
… | |
1260 | * Handles applying a sign. |
1263 | * Handles applying a sign. |
1261 | */ |
1264 | */ |
1262 | static void |
1265 | static void |
1263 | apply_sign (object *op, object *sign, int autoapply) |
1266 | apply_sign (object *op, object *sign, int autoapply) |
1264 | { |
1267 | { |
1265 | readable_message_type *msgType; |
1268 | if (sign->has_dialogue ()) |
|
|
1269 | { |
|
|
1270 | op->statusmsg (format ("Maybe you should I<talk> to the %s instead?", &sign->name)); |
|
|
1271 | return; |
|
|
1272 | } |
1266 | |
1273 | |
1267 | if (!sign->msg) |
1274 | if (!sign->msg) |
1268 | { |
1275 | { |
1269 | op->statusmsg ("Nothing is written on it."); |
1276 | op->contr->infobox (MSG_CHANNEL ("examine"), |
|
|
1277 | format ("T<%s>\n\n Nothing %sis written on it.", |
|
|
1278 | &sign->name, |
|
|
1279 | sign->name == sign->arch->name ? "" : "else ")); |
1270 | return; |
1280 | return; |
1271 | } |
1281 | } |
1272 | |
1282 | |
1273 | if (sign->stats.food) |
1283 | if (sign->stats.food) |
1274 | { |
1284 | { |
1275 | if (sign->last_eat >= sign->stats.food) |
1285 | if (sign->last_eat >= sign->stats.food) |
1276 | { |
1286 | { |
1277 | if (!sign->move_on) |
1287 | if (!sign->move_on) |
1278 | op->statusmsg ("You cannot read it anymore."); |
1288 | op->failmsg ("You cannot read it anymore."); |
1279 | |
1289 | |
1280 | return; |
1290 | return; |
1281 | } |
1291 | } |
1282 | |
1292 | |
1283 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1293 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
… | |
… | |
1301 | if (sign->sound) |
1311 | if (sign->sound) |
1302 | ns->play_sound (sign->sound); |
1312 | ns->play_sound (sign->sound); |
1303 | else if (autoapply) |
1313 | else if (autoapply) |
1304 | ns->play_sound (sound_find ("msg_voice")); |
1314 | ns->play_sound (sound_find ("msg_voice")); |
1305 | |
1315 | |
1306 | if (ns->can_msg) |
|
|
1307 | op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg)); |
1316 | op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &sign->name, &sign->msg)); |
1308 | else |
|
|
1309 | { |
|
|
1310 | msgType = get_readable_message_type (sign); |
|
|
1311 | const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg); |
|
|
1312 | draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg); |
|
|
1313 | } |
|
|
1314 | } |
1317 | } |
|
|
1318 | } |
|
|
1319 | |
|
|
1320 | static void |
|
|
1321 | move_apply_hole (object *trap, object *victim) |
|
|
1322 | { |
|
|
1323 | /* Hole not open? */ |
|
|
1324 | if (trap->stats.wc > 0) |
|
|
1325 | return; |
|
|
1326 | |
|
|
1327 | /* Is this a multipart monster and not the head? If so, return. |
|
|
1328 | * Processing will happen if the head runs into the pit |
|
|
1329 | */ |
|
|
1330 | if (victim->head) |
|
|
1331 | return; |
|
|
1332 | |
|
|
1333 | // now find all possible locations and randomly pick one |
|
|
1334 | int dir = find_free_spot (victim, trap->map, EXIT_X (trap), EXIT_Y (trap), 0, |
|
|
1335 | trap->range >= 3 ? SIZEOFFREE3 + 1 |
|
|
1336 | : trap->range >= 2 ? SIZEOFFREE2 + 1 |
|
|
1337 | : trap->range >= 1 ? SIZEOFFREE1 + 1 |
|
|
1338 | : SIZEOFFREE0 + 1); |
|
|
1339 | |
|
|
1340 | if (dir < 0) |
|
|
1341 | return; |
|
|
1342 | |
|
|
1343 | victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole")); |
|
|
1344 | victim->statusmsg ("You fall through the hole!", NDI_RED); |
|
|
1345 | |
|
|
1346 | transfer_ob (victim, |
|
|
1347 | EXIT_X (trap) + freearr_x[dir], |
|
|
1348 | EXIT_Y (trap) + freearr_y[dir], |
|
|
1349 | 0, victim); |
1315 | } |
1350 | } |
1316 | |
1351 | |
1317 | /** |
1352 | /** |
1318 | * 'victim' moves onto 'trap' |
1353 | * 'victim' moves onto 'trap' |
1319 | * 'victim' leaves 'trap' |
1354 | * 'victim' leaves 'trap' |
… | |
… | |
1488 | case CHECK_INV: |
1523 | case CHECK_INV: |
1489 | check_inv (victim, trap); |
1524 | check_inv (victim, trap); |
1490 | goto leave; |
1525 | goto leave; |
1491 | |
1526 | |
1492 | case HOLE: |
1527 | case HOLE: |
1493 | /* Hole not open? */ |
1528 | move_apply_hole (trap, victim); |
1494 | if (trap->stats.wc > 0) |
|
|
1495 | goto leave; |
|
|
1496 | |
|
|
1497 | /* Is this a multipart monster and not the head? If so, return. |
|
|
1498 | * Processing will happen if the head runs into the pit |
|
|
1499 | */ |
|
|
1500 | if (victim->head) |
|
|
1501 | goto leave; |
|
|
1502 | |
|
|
1503 | victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole")); |
|
|
1504 | victim->statusmsg ("You fall through the hole!", NDI_RED); |
|
|
1505 | transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim); |
|
|
1506 | goto leave; |
1529 | goto leave; |
1507 | |
1530 | |
1508 | case EXIT: |
1531 | case EXIT: |
1509 | if (victim->type == PLAYER && EXIT_PATH (trap)) |
1532 | if (victim->type == PLAYER && EXIT_PATH (trap)) |
1510 | { |
1533 | { |
… | |
… | |
1602 | |
1625 | |
1603 | readable_message_type *msgType = get_readable_message_type (tmp); |
1626 | readable_message_type *msgType = get_readable_message_type (tmp); |
1604 | |
1627 | |
1605 | if (player *pl = op->contr) |
1628 | if (player *pl = op->contr) |
1606 | if (client *ns = pl->ns) |
1629 | if (client *ns = pl->ns) |
1607 | if (ns->can_msg) |
|
|
1608 | pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n\n\n%s", (char *)long_desc (tmp, op), &tmp->msg)); |
1630 | pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg)); |
1609 | else |
|
|
1610 | draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, |
|
|
1611 | msgType->message_type, msgType->message_subtype, |
|
|
1612 | "You open the %s and start reading.\n%s", (char *)"%s\n%s", |
|
|
1613 | long_desc (tmp, op), &tmp->msg); |
|
|
1614 | |
1631 | |
1615 | /* gain xp from reading */ |
1632 | /* gain xp from reading */ |
1616 | if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) |
1633 | if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) |
1617 | { /* only if not read before */ |
1634 | { /* only if not read before */ |
1618 | int exp_gain = calc_skill_exp (op, tmp, skill_ob); |
1635 | int exp_gain = calc_skill_exp (op, tmp, skill_ob); |
… | |
… | |
1941 | if (op->destroyed () || tmp->destroyed ()) |
1958 | if (op->destroyed () || tmp->destroyed ()) |
1942 | break; |
1959 | break; |
1943 | } |
1960 | } |
1944 | |
1961 | |
1945 | if (!tmp->destroyed () && !tmp->inv) |
1962 | if (!tmp->destroyed () && !tmp->inv) |
1946 | tmp->decrease (); |
1963 | tmp->decrease (true); |
1947 | } |
1964 | } |
1948 | |
1965 | |
1949 | /** |
1966 | /** |
1950 | * op eats food. |
1967 | * op eats food. |
1951 | * If player, takes care of messages and dragon special food. |
1968 | * If player, takes care of messages and dragon special food. |
… | |
… | |
2146 | op->statusmsg (buf); |
2163 | op->statusmsg (buf); |
2147 | |
2164 | |
2148 | /* now choose a winner if we have any */ |
2165 | /* now choose a winner if we have any */ |
2149 | i = -1; |
2166 | i = -1; |
2150 | if (winners > 0) |
2167 | if (winners > 0) |
2151 | i = atnr_winner[RANDOM () % winners]; |
2168 | i = atnr_winner [rndm (winners)]; |
2152 | |
2169 | |
2153 | if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) |
2170 | if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) |
2154 | { |
2171 | { |
2155 | /* resistance increased! */ |
2172 | /* resistance increased! */ |
2156 | skin->resist[i]++; |
2173 | skin->resist[i]++; |
… | |
… | |
2636 | * person moving on it, also activate. Added code to make it |
2653 | * person moving on it, also activate. Added code to make it |
2637 | * so that at least one of players movement types be that which |
2654 | * so that at least one of players movement types be that which |
2638 | * the item needs. |
2655 | * the item needs. |
2639 | */ |
2656 | */ |
2640 | if (!tmp->invisible || (tmp->move_on & pl->move_type)) |
2657 | if (!tmp->invisible || (tmp->move_on & pl->move_type)) |
2641 | { |
|
|
2642 | if (player_apply (pl, tmp, 0, 1) == 1) |
2658 | if (player_apply (pl, tmp, 0, 1) == 1) |
2643 | return; |
2659 | return; |
2644 | } |
2660 | |
2645 | if (floors >= 2) |
2661 | if (floors >= 2) |
2646 | return; /* process at most two floor objects */ |
2662 | return; /* process at most two floor objects */ |
2647 | } |
2663 | } |
2648 | } |
2664 | } |
2649 | |
2665 | |
… | |
… | |
2743 | op->destroy (); |
2759 | op->destroy (); |
2744 | who->insert (tmp2); |
2760 | who->insert (tmp2); |
2745 | who->update_stats (); |
2761 | who->update_stats (); |
2746 | |
2762 | |
2747 | if (who->contr) |
2763 | if (who->contr) |
2748 | { |
|
|
2749 | if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) |
2764 | if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) |
2750 | { |
2765 | { |
2751 | who->failmsg ("Oops, it feels deadly cold!"); |
2766 | who->failmsg ("Oops, it feels deadly cold!"); |
2752 | SET_FLAG (tmp2, FLAG_KNOWN_CURSED); |
2767 | SET_FLAG (tmp2, FLAG_KNOWN_CURSED); |
2753 | } |
2768 | } |
2754 | } |
|
|
2755 | } |
2769 | } |
2756 | |
2770 | |
2757 | return 1; /* otherwise, an attempt to drop causes problems */ |
2771 | return 1; /* otherwise, an attempt to drop causes problems */ |
2758 | |
2772 | |
2759 | case BOW: |
2773 | case BOW: |
… | |
… | |
3281 | who->update_stats (); |
3295 | who->update_stats (); |
3282 | |
3296 | |
3283 | if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) |
3297 | if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) |
3284 | if (who->type == PLAYER) |
3298 | if (who->type == PLAYER) |
3285 | { |
3299 | { |
3286 | who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"); |
3300 | who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright (hrhrhr) idea to apply this cursed or damned item.>"); |
3287 | SET_FLAG (tmp2, FLAG_KNOWN_CURSED); |
3301 | SET_FLAG (tmp2, FLAG_KNOWN_CURSED); |
3288 | } |
3302 | } |
3289 | |
3303 | |
3290 | return 0; |
3304 | return 0; |
3291 | |
3305 | |
… | |
… | |
3469 | if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) |
3483 | if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) |
3470 | if (who->type == PLAYER) |
3484 | if (who->type == PLAYER) |
3471 | { |
3485 | { |
3472 | who->failmsg ( |
3486 | who->failmsg ( |
3473 | "Oops, it feels deadly cold! " |
3487 | "Oops, it feels deadly cold! " |
3474 | "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>" |
3488 | "H<Maybe it wasn't such a bright idea to apply this cursed or damned item.>" |
3475 | ); |
3489 | ); |
3476 | SET_FLAG (op, FLAG_KNOWN_CURSED); |
3490 | SET_FLAG (op, FLAG_KNOWN_CURSED); |
3477 | } |
3491 | } |
3478 | |
3492 | |
3479 | if (object *pl = op->visible_to ()) |
3493 | if (object *pl = op->visible_to ()) |
… | |
… | |
3499 | int |
3513 | int |
3500 | auto_apply (object *op) |
3514 | auto_apply (object *op) |
3501 | { |
3515 | { |
3502 | object *tmp = NULL, *tmp2; |
3516 | object *tmp = NULL, *tmp2; |
3503 | int i; |
3517 | int i; |
|
|
3518 | |
|
|
3519 | CLEAR_FLAG (op, FLAG_AUTO_APPLY); |
3504 | |
3520 | |
3505 | switch (op->type) |
3521 | switch (op->type) |
3506 | { |
3522 | { |
3507 | case SHOP_FLOOR: |
3523 | case SHOP_FLOOR: |
3508 | if (!op->has_random_items ()) |
3524 | if (!op->has_random_items ()) |
… | |
… | |
3510 | |
3526 | |
3511 | do |
3527 | do |
3512 | { |
3528 | { |
3513 | i = 10; /* let's give it 10 tries */ |
3529 | i = 10; /* let's give it 10 tries */ |
3514 | while ((tmp = generate_treasure (op->randomitems, |
3530 | while ((tmp = generate_treasure (op->randomitems, |
3515 | op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i); |
3531 | op->stats.exp |
|
|
3532 | ? (int) op->stats.exp |
|
|
3533 | : max (op->map->difficulty, 5))) |
|
|
3534 | == NULL && --i); |
|
|
3535 | |
3516 | if (tmp == NULL) |
3536 | if (tmp == NULL) |
3517 | return 0; |
3537 | return 0; |
|
|
3538 | |
3518 | if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) |
3539 | if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) |
3519 | { |
3540 | { |
3520 | tmp->destroy (); |
3541 | tmp->destroy (); |
3521 | tmp = NULL; |
3542 | tmp = NULL; |
3522 | } |
3543 | } |
… | |
… | |
3525 | |
3546 | |
3526 | tmp->x = op->x; |
3547 | tmp->x = op->x; |
3527 | tmp->y = op->y; |
3548 | tmp->y = op->y; |
3528 | SET_FLAG (tmp, FLAG_UNPAID); |
3549 | SET_FLAG (tmp, FLAG_UNPAID); |
3529 | insert_ob_in_map (tmp, op->map, NULL, 0); |
3550 | insert_ob_in_map (tmp, op->map, NULL, 0); |
3530 | CLEAR_FLAG (op, FLAG_AUTO_APPLY); |
|
|
3531 | identify (tmp); |
3551 | identify (tmp); |
3532 | break; |
3552 | break; |
3533 | |
3553 | |
3534 | case TREASURE: |
3554 | case TREASURE: |
3535 | if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
3555 | if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
… | |
… | |
3542 | /* If we generated an object and put it in this object inventory, |
3562 | /* If we generated an object and put it in this object inventory, |
3543 | * move it to the parent object as the current object is about |
3563 | * move it to the parent object as the current object is about |
3544 | * to disappear. An example of this item is the random_* stuff |
3564 | * to disappear. An example of this item is the random_* stuff |
3545 | * that is put inside other objects. |
3565 | * that is put inside other objects. |
3546 | */ |
3566 | */ |
3547 | for (tmp = op->inv; tmp; tmp = tmp2) |
|
|
3548 | { |
|
|
3549 | tmp2 = tmp->below; |
|
|
3550 | tmp->remove (); |
|
|
3551 | |
|
|
3552 | if (op->env) |
3567 | if (op->env) |
3553 | insert_ob_in_ob (tmp, op->env); |
3568 | while (op->inv) |
3554 | else |
3569 | op->env->insert (op->inv); |
3555 | tmp->destroy (); |
|
|
3556 | } |
|
|
3557 | |
3570 | |
3558 | op->destroy (); |
3571 | op->destroy (); |
3559 | break; |
3572 | break; |
3560 | } |
3573 | } |
3561 | return tmp ? 1 : 0; |
3574 | |
|
|
3575 | return !!tmp; |
3562 | } |
3576 | } |
3563 | |
3577 | |
3564 | /** |
3578 | /** |
3565 | * fix_auto_apply goes through the entire map every time a map |
3579 | * fix_auto_apply goes through the entire map every time a map |
3566 | * is loaded or swapped in and performs special actions for |
3580 | * is loaded or swapped in and performs special actions for |
… | |
… | |
3580 | |
3594 | |
3581 | if (tmp->inv) |
3595 | if (tmp->inv) |
3582 | { |
3596 | { |
3583 | object *invtmp, *invnext; |
3597 | object *invtmp, *invnext; |
3584 | |
3598 | |
3585 | for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) |
3599 | for (invtmp = tmp->inv; invtmp; invtmp = invnext) |
3586 | { |
3600 | { |
3587 | invnext = invtmp->below; |
3601 | invnext = invtmp->below; |
3588 | |
3602 | |
3589 | if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) |
3603 | if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) |
3590 | auto_apply (invtmp); |
3604 | auto_apply (invtmp); |
3591 | else if (invtmp->type == TREASURE && invtmp->has_random_items ()) |
3605 | else if (invtmp->type == TREASURE && invtmp->has_random_items ()) |
3592 | { |
3606 | { |
3593 | while ((invtmp->stats.hp--) > 0) |
3607 | while (invtmp->stats.hp-- > 0) |
3594 | create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0); |
3608 | create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0); |
3595 | |
3609 | |
3596 | invtmp->randomitems = NULL; |
3610 | invtmp->randomitems = NULL; |
3597 | } |
3611 | } |
3598 | else if (invtmp && invtmp->arch |
3612 | else if (invtmp && invtmp->arch |