… | |
… | |
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 |
… | |
… | |
1238 | |
1230 | |
1239 | object *top, *floor = NULL; |
1231 | object *top, *floor = NULL; |
1240 | |
1232 | |
1241 | op->remove (); |
1233 | op->remove (); |
1242 | |
1234 | |
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)) |
1235 | if (out_of_map (m, op->x, op->y)) |
1252 | { |
1236 | { |
1253 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); |
1237 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); |
1254 | #ifdef MANY_CORES |
1238 | #ifdef MANY_CORES |
1255 | /* Better to catch this here, as otherwise the next use of this object |
1239 | /* Better to catch this here, as otherwise the next use of this object |
… | |
… | |
1421 | op->map->touch (); |
1405 | op->map->touch (); |
1422 | } |
1406 | } |
1423 | |
1407 | |
1424 | op->map->dirty = true; |
1408 | op->map->dirty = true; |
1425 | |
1409 | |
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)) |
1410 | if (!(flag & INS_MAP_LOAD)) |
1430 | if (object *pl = ms.player ()) |
1411 | if (object *pl = ms.player ()) |
1431 | pl->contr->ns->floorbox_update (); |
1412 | pl->contr->ns->floorbox_update (); |
1432 | |
1413 | |
1433 | /* If this object glows, it may affect lighting conditions that are |
1414 | /* If this object glows, it may affect lighting conditions that are |
… | |
… | |
1674 | * be != op, if items are merged. -Tero |
1655 | * be != op, if items are merged. -Tero |
1675 | */ |
1656 | */ |
1676 | object * |
1657 | object * |
1677 | object::insert (object *op) |
1658 | object::insert (object *op) |
1678 | { |
1659 | { |
1679 | object *tmp, *otmp; |
|
|
1680 | |
|
|
1681 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1660 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1682 | op->remove (); |
1661 | op->remove (); |
1683 | |
1662 | |
1684 | if (op->more) |
1663 | if (op->more) |
1685 | { |
1664 | { |
… | |
… | |
1687 | return op; |
1666 | return op; |
1688 | } |
1667 | } |
1689 | |
1668 | |
1690 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1669 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1691 | CLEAR_FLAG (op, FLAG_REMOVED); |
1670 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
1671 | |
1692 | if (op->nrof) |
1672 | if (op->nrof) |
1693 | { |
1673 | { |
1694 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1674 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1695 | if (object::can_merge (tmp, op)) |
1675 | if (object::can_merge (tmp, op)) |
1696 | { |
1676 | { |
1697 | /* return the original object and remove inserted object |
1677 | /* return the original object and remove inserted object |
1698 | (client needs the original object) */ |
1678 | (client needs the original object) */ |
1699 | tmp->nrof += op->nrof; |
1679 | tmp->nrof += op->nrof; |
… | |
… | |
1718 | add_weight (this, op->weight * op->nrof); |
1698 | add_weight (this, op->weight * op->nrof); |
1719 | } |
1699 | } |
1720 | else |
1700 | else |
1721 | add_weight (this, (op->weight + op->carrying)); |
1701 | add_weight (this, (op->weight + op->carrying)); |
1722 | |
1702 | |
1723 | otmp = this->in_player (); |
1703 | if (object *otmp = this->in_player ()) |
1724 | if (otmp && otmp->contr) |
|
|
1725 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1704 | if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1726 | otmp->update_stats (); |
1705 | otmp->update_stats (); |
1727 | |
1706 | |
|
|
1707 | op->owner = 0; // its his/hers now. period. |
1728 | op->map = 0; |
1708 | op->map = 0; |
1729 | op->env = this; |
1709 | op->env = this; |
1730 | op->above = 0; |
1710 | op->above = 0; |
1731 | op->below = 0; |
1711 | op->below = 0; |
1732 | op->x = 0, op->y = 0; |
1712 | op->x = op->y = 0; |
1733 | |
1713 | |
1734 | /* reset the light list and los of the players on the map */ |
1714 | /* reset the light list and los of the players on the map */ |
1735 | if ((op->glow_radius != 0) && map) |
1715 | if (op->glow_radius && map) |
1736 | { |
1716 | { |
1737 | #ifdef DEBUG_LIGHTS |
1717 | #ifdef DEBUG_LIGHTS |
1738 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1718 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1739 | #endif /* DEBUG_LIGHTS */ |
1719 | #endif /* DEBUG_LIGHTS */ |
1740 | if (map->darkness) |
1720 | if (map->darkness) |
… | |
… | |
2611 | &name, |
2591 | &name, |
2612 | title ? "\",title:\"" : "", |
2592 | title ? "\",title:\"" : "", |
2613 | title ? (const char *)title : "", |
2593 | title ? (const char *)title : "", |
2614 | flag_desc (flagdesc, 512), type); |
2594 | flag_desc (flagdesc, 512), type); |
2615 | |
2595 | |
2616 | if (env) |
2596 | if (!this->flag[FLAG_REMOVED] && env) |
2617 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2597 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2618 | |
2598 | |
2619 | if (map) |
2599 | if (map) |
2620 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2600 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2621 | |
2601 | |
… | |
… | |
2668 | old_container->flag [FLAG_APPLIED] = 0; |
2648 | old_container->flag [FLAG_APPLIED] = 0; |
2669 | container = 0; |
2649 | container = 0; |
2670 | |
2650 | |
2671 | esrv_update_item (UPD_FLAGS, this, old_container); |
2651 | esrv_update_item (UPD_FLAGS, this, old_container); |
2672 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2652 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
|
|
2653 | play_sound (sound_find ("chest_close")); |
2673 | } |
2654 | } |
2674 | |
2655 | |
2675 | if (new_container) |
2656 | if (new_container) |
2676 | { |
2657 | { |
2677 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
2658 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
… | |
… | |
2693 | new_container->flag [FLAG_APPLIED] = 1; |
2674 | new_container->flag [FLAG_APPLIED] = 1; |
2694 | container = new_container; |
2675 | container = new_container; |
2695 | |
2676 | |
2696 | esrv_update_item (UPD_FLAGS, this, new_container); |
2677 | esrv_update_item (UPD_FLAGS, this, new_container); |
2697 | esrv_send_inventory (this, new_container); |
2678 | esrv_send_inventory (this, new_container); |
|
|
2679 | play_sound (sound_find ("chest_open")); |
2698 | } |
2680 | } |
2699 | } |
2681 | } |
2700 | |
2682 | |
2701 | object * |
2683 | object * |
2702 | object::force_find (const shstr name) |
2684 | object::force_find (const shstr name) |
… | |
… | |
2728 | force->flag [FLAG_APPLIED] = true; |
2710 | force->flag [FLAG_APPLIED] = true; |
2729 | |
2711 | |
2730 | insert (force); |
2712 | insert (force); |
2731 | } |
2713 | } |
2732 | |
2714 | |
|
|
2715 | void |
|
|
2716 | object::play_sound (faceidx sound) const |
|
|
2717 | { |
|
|
2718 | if (!sound) |
|
|
2719 | return; |
|
|
2720 | |
|
|
2721 | if (flag [FLAG_REMOVED]) |
|
|
2722 | return; |
|
|
2723 | |
|
|
2724 | if (env) |
|
|
2725 | { |
|
|
2726 | if (object *pl = in_player ()) |
|
|
2727 | pl->contr->play_sound (sound); |
|
|
2728 | } |
|
|
2729 | else |
|
|
2730 | map->play_sound (sound, x, y); |
|
|
2731 | } |
|
|
2732 | |