… | |
… | |
374 | /* |
374 | /* |
375 | * get_nearest_part(multi-object, object 2) returns the part of the |
375 | * get_nearest_part(multi-object, object 2) returns the part of the |
376 | * multi-object 1 which is closest to the second object. |
376 | * multi-object 1 which is closest to the second object. |
377 | * If it's not a multi-object, it is returned. |
377 | * If it's not a multi-object, it is returned. |
378 | */ |
378 | */ |
379 | |
|
|
380 | object * |
379 | object * |
381 | get_nearest_part (object *op, const object *pl) |
380 | get_nearest_part (object *op, const object *pl) |
382 | { |
381 | { |
383 | object *tmp, *closest; |
382 | object *tmp, *closest; |
384 | int last_dist, i; |
383 | int last_dist, i; |
… | |
… | |
429 | } |
428 | } |
430 | |
429 | |
431 | /* |
430 | /* |
432 | * Sets the owner and sets the skill and exp pointers to owner's current |
431 | * Sets the owner and sets the skill and exp pointers to owner's current |
433 | * skill and experience objects. |
432 | * skill and experience objects. |
|
|
433 | * ACTUALLY NO! investigate! TODO |
434 | */ |
434 | */ |
435 | void |
435 | void |
436 | object::set_owner (object *owner) |
436 | object::set_owner (object *owner) |
437 | { |
437 | { |
|
|
438 | // allow objects which own objects |
438 | if (!owner) |
439 | if (owner) |
439 | return; |
|
|
440 | |
|
|
441 | /* next line added to allow objects which own objects */ |
|
|
442 | /* Add a check for ownercounts in here, as I got into an endless loop |
|
|
443 | * with the fireball owning a poison cloud which then owned the |
|
|
444 | * fireball. I believe that was caused by one of the objects getting |
|
|
445 | * freed and then another object replacing it. Since the ownercounts |
|
|
446 | * didn't match, this check is valid and I believe that cause is valid. |
|
|
447 | */ |
|
|
448 | while (owner->owner) |
440 | while (owner->owner) |
449 | owner = owner->owner; |
441 | owner = owner->owner; |
450 | |
442 | |
451 | this->owner = owner; |
443 | this->owner = owner; |
452 | } |
444 | } |
453 | |
445 | |
454 | int |
446 | int |
… | |
… | |
586 | object::copy_to (object *dst) |
578 | object::copy_to (object *dst) |
587 | { |
579 | { |
588 | *dst = *this; |
580 | *dst = *this; |
589 | |
581 | |
590 | if (speed < 0) |
582 | if (speed < 0) |
591 | dst->speed_left = speed_left - rndm (); |
583 | dst->speed_left -= rndm (); |
592 | |
584 | |
593 | dst->set_speed (dst->speed); |
585 | dst->set_speed (dst->speed); |
594 | } |
586 | } |
595 | |
587 | |
596 | void |
588 | void |
… | |
… | |
923 | |
915 | |
924 | if (!freed_map) |
916 | if (!freed_map) |
925 | { |
917 | { |
926 | freed_map = new maptile; |
918 | freed_map = new maptile; |
927 | |
919 | |
|
|
920 | freed_map->path = "<freed objects map>"; |
928 | freed_map->name = "/internal/freed_objects_map"; |
921 | freed_map->name = "/internal/freed_objects_map"; |
929 | freed_map->width = 3; |
922 | freed_map->width = 3; |
930 | freed_map->height = 3; |
923 | freed_map->height = 3; |
931 | |
924 | |
932 | freed_map->alloc (); |
925 | freed_map->alloc (); |
… | |
… | |
960 | return; |
953 | return; |
961 | |
954 | |
962 | if (destroy_inventory) |
955 | if (destroy_inventory) |
963 | destroy_inv (false); |
956 | destroy_inv (false); |
964 | |
957 | |
|
|
958 | if (is_head ()) |
|
|
959 | if (sound_destroy) |
965 | play_sound (sound_destroy); |
960 | play_sound (sound_destroy); |
|
|
961 | else if (flag [FLAG_MONSTER]) |
|
|
962 | play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism |
966 | |
963 | |
967 | attachable::destroy (); |
964 | attachable::destroy (); |
968 | } |
965 | } |
969 | |
966 | |
970 | /* |
967 | /* |
… | |
… | |
1085 | if (map->in_memory == MAP_SAVING) |
1082 | if (map->in_memory == MAP_SAVING) |
1086 | return; |
1083 | return; |
1087 | |
1084 | |
1088 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1085 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1089 | |
1086 | |
|
|
1087 | if (object *pl = ms.player ()) |
|
|
1088 | { |
|
|
1089 | if (pl->container == this) |
|
|
1090 | /* If a container that the player is currently using somehow gets |
|
|
1091 | * removed (most likely destroyed), update the player view |
|
|
1092 | * appropriately. |
|
|
1093 | */ |
|
|
1094 | pl->close_container (); |
|
|
1095 | |
|
|
1096 | pl->contr->ns->floorbox_update (); |
|
|
1097 | } |
|
|
1098 | |
1090 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1099 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1091 | { |
1100 | { |
1092 | /* No point updating the players look faces if he is the object |
1101 | /* No point updating the players look faces if he is the object |
1093 | * being removed. |
1102 | * being removed. |
1094 | */ |
1103 | */ |
1095 | |
|
|
1096 | if (tmp->type == PLAYER && tmp != this) |
|
|
1097 | { |
|
|
1098 | /* If a container that the player is currently using somehow gets |
|
|
1099 | * removed (most likely destroyed), update the player view |
|
|
1100 | * appropriately. |
|
|
1101 | */ |
|
|
1102 | if (tmp->container == this) |
|
|
1103 | { |
|
|
1104 | flag [FLAG_APPLIED] = 0; |
|
|
1105 | tmp->container = 0; |
|
|
1106 | } |
|
|
1107 | |
|
|
1108 | if (tmp->contr->ns) |
|
|
1109 | tmp->contr->ns->floorbox_update (); |
|
|
1110 | } |
|
|
1111 | |
1104 | |
1112 | /* See if object moving off should effect something */ |
1105 | /* See if object moving off should effect something */ |
1113 | if (check_walk_off |
1106 | if (check_walk_off |
1114 | && ((move_type & tmp->move_off) |
1107 | && ((move_type & tmp->move_off) |
1115 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1108 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
… | |
… | |
1238 | |
1231 | |
1239 | object *top, *floor = NULL; |
1232 | object *top, *floor = NULL; |
1240 | |
1233 | |
1241 | op->remove (); |
1234 | op->remove (); |
1242 | |
1235 | |
1243 | #if 0 |
|
|
1244 | if (!m->active != !op->active) |
|
|
1245 | if (m->active) |
|
|
1246 | op->activate_recursive (); |
|
|
1247 | else |
|
|
1248 | op->deactivate_recursive (); |
|
|
1249 | #endif |
|
|
1250 | |
|
|
1251 | if (out_of_map (m, op->x, op->y)) |
1236 | if (out_of_map (m, op->x, op->y)) |
1252 | { |
1237 | { |
1253 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); |
1238 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); |
1254 | #ifdef MANY_CORES |
1239 | #ifdef MANY_CORES |
1255 | /* Better to catch this here, as otherwise the next use of this object |
1240 | /* Better to catch this here, as otherwise the next use of this object |
… | |
… | |
1421 | op->map->touch (); |
1406 | op->map->touch (); |
1422 | } |
1407 | } |
1423 | |
1408 | |
1424 | op->map->dirty = true; |
1409 | op->map->dirty = true; |
1425 | |
1410 | |
1426 | /* If we have a floor, we know the player, if any, will be above |
|
|
1427 | * it, so save a few ticks and start from there. |
|
|
1428 | */ |
|
|
1429 | if (!(flag & INS_MAP_LOAD)) |
1411 | if (!(flag & INS_MAP_LOAD)) |
1430 | if (object *pl = ms.player ()) |
1412 | if (object *pl = ms.player ()) |
1431 | if (pl->contr->ns) |
|
|
1432 | pl->contr->ns->floorbox_update (); |
1413 | pl->contr->ns->floorbox_update (); |
1433 | |
1414 | |
1434 | /* If this object glows, it may affect lighting conditions that are |
1415 | /* If this object glows, it may affect lighting conditions that are |
1435 | * visible to others on this map. But update_all_los is really |
1416 | * visible to others on this map. But update_all_los is really |
1436 | * an inefficient way to do this, as it means los for all players |
1417 | * an inefficient way to do this, as it means los for all players |
1437 | * on the map will get recalculated. The players could very well |
1418 | * on the map will get recalculated. The players could very well |
… | |
… | |
1675 | * be != op, if items are merged. -Tero |
1656 | * be != op, if items are merged. -Tero |
1676 | */ |
1657 | */ |
1677 | object * |
1658 | object * |
1678 | object::insert (object *op) |
1659 | object::insert (object *op) |
1679 | { |
1660 | { |
1680 | object *tmp, *otmp; |
|
|
1681 | |
|
|
1682 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1661 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1683 | op->remove (); |
1662 | op->remove (); |
1684 | |
1663 | |
1685 | if (op->more) |
1664 | if (op->more) |
1686 | { |
1665 | { |
… | |
… | |
1688 | return op; |
1667 | return op; |
1689 | } |
1668 | } |
1690 | |
1669 | |
1691 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1670 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1692 | CLEAR_FLAG (op, FLAG_REMOVED); |
1671 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
1672 | |
1693 | if (op->nrof) |
1673 | if (op->nrof) |
1694 | { |
1674 | { |
1695 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1675 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1696 | if (object::can_merge (tmp, op)) |
1676 | if (object::can_merge (tmp, op)) |
1697 | { |
1677 | { |
1698 | /* return the original object and remove inserted object |
1678 | /* return the original object and remove inserted object |
1699 | (client needs the original object) */ |
1679 | (client needs the original object) */ |
1700 | tmp->nrof += op->nrof; |
1680 | tmp->nrof += op->nrof; |
… | |
… | |
1719 | add_weight (this, op->weight * op->nrof); |
1699 | add_weight (this, op->weight * op->nrof); |
1720 | } |
1700 | } |
1721 | else |
1701 | else |
1722 | add_weight (this, (op->weight + op->carrying)); |
1702 | add_weight (this, (op->weight + op->carrying)); |
1723 | |
1703 | |
1724 | otmp = this->in_player (); |
1704 | if (object *otmp = this->in_player ()) |
1725 | if (otmp && otmp->contr) |
|
|
1726 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1705 | if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1727 | otmp->update_stats (); |
1706 | otmp->update_stats (); |
1728 | |
1707 | |
|
|
1708 | op->owner = 0; // its his/hers now. period. |
1729 | op->map = 0; |
1709 | op->map = 0; |
1730 | op->env = this; |
1710 | op->env = this; |
1731 | op->above = 0; |
1711 | op->above = 0; |
1732 | op->below = 0; |
1712 | op->below = 0; |
1733 | op->x = 0, op->y = 0; |
1713 | op->x = op->y = 0; |
1734 | |
1714 | |
1735 | /* reset the light list and los of the players on the map */ |
1715 | /* reset the light list and los of the players on the map */ |
1736 | if ((op->glow_radius != 0) && map) |
1716 | if (op->glow_radius && map) |
1737 | { |
1717 | { |
1738 | #ifdef DEBUG_LIGHTS |
1718 | #ifdef DEBUG_LIGHTS |
1739 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1719 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1740 | #endif /* DEBUG_LIGHTS */ |
1720 | #endif /* DEBUG_LIGHTS */ |
1741 | if (map->darkness) |
1721 | if (map->darkness) |
… | |
… | |
2345 | * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause |
2325 | * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause |
2346 | * core dumps if they do. |
2326 | * core dumps if they do. |
2347 | * |
2327 | * |
2348 | * Add a check so we can't pick up invisible objects (0.93.8) |
2328 | * Add a check so we can't pick up invisible objects (0.93.8) |
2349 | */ |
2329 | */ |
2350 | |
|
|
2351 | int |
2330 | int |
2352 | can_pick (const object *who, const object *item) |
2331 | can_pick (const object *who, const object *item) |
2353 | { |
2332 | { |
2354 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2333 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2355 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2334 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
… | |
… | |
2613 | &name, |
2592 | &name, |
2614 | title ? "\",title:\"" : "", |
2593 | title ? "\",title:\"" : "", |
2615 | title ? (const char *)title : "", |
2594 | title ? (const char *)title : "", |
2616 | flag_desc (flagdesc, 512), type); |
2595 | flag_desc (flagdesc, 512), type); |
2617 | |
2596 | |
2618 | if (env) |
2597 | if (!this->flag[FLAG_REMOVED] && env) |
2619 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2598 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2620 | |
2599 | |
2621 | if (map) |
2600 | if (map) |
2622 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2601 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2623 | |
2602 | |
… | |
… | |
2670 | old_container->flag [FLAG_APPLIED] = 0; |
2649 | old_container->flag [FLAG_APPLIED] = 0; |
2671 | container = 0; |
2650 | container = 0; |
2672 | |
2651 | |
2673 | esrv_update_item (UPD_FLAGS, this, old_container); |
2652 | esrv_update_item (UPD_FLAGS, this, old_container); |
2674 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2653 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
|
|
2654 | play_sound (sound_find ("chest_close")); |
2675 | } |
2655 | } |
2676 | |
2656 | |
2677 | if (new_container) |
2657 | if (new_container) |
2678 | { |
2658 | { |
2679 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
2659 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
… | |
… | |
2695 | new_container->flag [FLAG_APPLIED] = 1; |
2675 | new_container->flag [FLAG_APPLIED] = 1; |
2696 | container = new_container; |
2676 | container = new_container; |
2697 | |
2677 | |
2698 | esrv_update_item (UPD_FLAGS, this, new_container); |
2678 | esrv_update_item (UPD_FLAGS, this, new_container); |
2699 | esrv_send_inventory (this, new_container); |
2679 | esrv_send_inventory (this, new_container); |
|
|
2680 | play_sound (sound_find ("chest_open")); |
2700 | } |
2681 | } |
2701 | } |
2682 | } |
2702 | |
2683 | |
2703 | object * |
2684 | object * |
2704 | object::force_find (const shstr name) |
2685 | object::force_find (const shstr name) |
… | |
… | |
2730 | force->flag [FLAG_APPLIED] = true; |
2711 | force->flag [FLAG_APPLIED] = true; |
2731 | |
2712 | |
2732 | insert (force); |
2713 | insert (force); |
2733 | } |
2714 | } |
2734 | |
2715 | |
|
|
2716 | void |
|
|
2717 | object::play_sound (faceidx sound) const |
|
|
2718 | { |
|
|
2719 | if (!sound) |
|
|
2720 | return; |
|
|
2721 | |
|
|
2722 | if (flag [FLAG_REMOVED]) |
|
|
2723 | return; |
|
|
2724 | |
|
|
2725 | if (env) |
|
|
2726 | { |
|
|
2727 | if (object *pl = in_player ()) |
|
|
2728 | pl->contr->play_sound (sound); |
|
|
2729 | } |
|
|
2730 | else |
|
|
2731 | map->play_sound (sound, x, y); |
|
|
2732 | } |
|
|
2733 | |