… | |
… | |
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 ()) |
965 | if (sound_destroy) |
959 | if (sound_destroy) |
966 | play_sound (sound_destroy); |
960 | play_sound (sound_destroy); |
967 | else if (flag [FLAG_MONSTER]) |
961 | else if (flag [FLAG_MONSTER]) |
968 | play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism |
962 | play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism |
969 | |
963 | |
970 | attachable::destroy (); |
964 | attachable::destroy (); |
971 | } |
965 | } |
972 | |
966 | |
973 | /* |
967 | /* |
… | |
… | |
1088 | if (map->in_memory == MAP_SAVING) |
1082 | if (map->in_memory == MAP_SAVING) |
1089 | return; |
1083 | return; |
1090 | |
1084 | |
1091 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1085 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1092 | |
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 | |
1093 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1099 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1094 | { |
1100 | { |
1095 | /* 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 |
1096 | * being removed. |
1102 | * being removed. |
1097 | */ |
1103 | */ |
1098 | |
|
|
1099 | if (tmp->type == PLAYER && tmp != this) |
|
|
1100 | { |
|
|
1101 | /* If a container that the player is currently using somehow gets |
|
|
1102 | * removed (most likely destroyed), update the player view |
|
|
1103 | * appropriately. |
|
|
1104 | */ |
|
|
1105 | if (tmp->container == this) |
|
|
1106 | { |
|
|
1107 | flag [FLAG_APPLIED] = 0; |
|
|
1108 | tmp->container = 0; |
|
|
1109 | } |
|
|
1110 | |
|
|
1111 | if (tmp->contr->ns) |
|
|
1112 | tmp->contr->ns->floorbox_update (); |
|
|
1113 | } |
|
|
1114 | |
1104 | |
1115 | /* See if object moving off should effect something */ |
1105 | /* See if object moving off should effect something */ |
1116 | if (check_walk_off |
1106 | if (check_walk_off |
1117 | && ((move_type & tmp->move_off) |
1107 | && ((move_type & tmp->move_off) |
1118 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1108 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
… | |
… | |
1241 | |
1231 | |
1242 | object *top, *floor = NULL; |
1232 | object *top, *floor = NULL; |
1243 | |
1233 | |
1244 | op->remove (); |
1234 | op->remove (); |
1245 | |
1235 | |
1246 | #if 0 |
|
|
1247 | if (!m->active != !op->active) |
|
|
1248 | if (m->active) |
|
|
1249 | op->activate_recursive (); |
|
|
1250 | else |
|
|
1251 | op->deactivate_recursive (); |
|
|
1252 | #endif |
|
|
1253 | |
|
|
1254 | if (out_of_map (m, op->x, op->y)) |
|
|
1255 | { |
|
|
1256 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); |
|
|
1257 | #ifdef MANY_CORES |
|
|
1258 | /* Better to catch this here, as otherwise the next use of this object |
|
|
1259 | * is likely to cause a crash. Better to find out where it is getting |
|
|
1260 | * improperly inserted. |
|
|
1261 | */ |
|
|
1262 | abort (); |
|
|
1263 | #endif |
|
|
1264 | return op; |
|
|
1265 | } |
|
|
1266 | |
|
|
1267 | if (object *more = op->more) |
|
|
1268 | if (!insert_ob_in_map (more, m, originator, flag)) |
|
|
1269 | return 0; |
|
|
1270 | |
|
|
1271 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
1272 | |
|
|
1273 | /* Ideally, the caller figures this out. However, it complicates a lot |
1236 | /* Ideally, the caller figures this out. However, it complicates a lot |
1274 | * of areas of callers (eg, anything that uses find_free_spot would now |
1237 | * of areas of callers (eg, anything that uses find_free_spot would now |
1275 | * need extra work |
1238 | * need extra work |
1276 | */ |
1239 | */ |
1277 | if (!xy_normalise (m, op->x, op->y)) |
1240 | if (!xy_normalise (m, op->x, op->y)) |
|
|
1241 | { |
|
|
1242 | op->destroy (); |
1278 | return 0; |
1243 | return 0; |
|
|
1244 | } |
|
|
1245 | |
|
|
1246 | if (object *more = op->more) |
|
|
1247 | if (!insert_ob_in_map (more, m, originator, flag)) |
|
|
1248 | return 0; |
|
|
1249 | |
|
|
1250 | CLEAR_FLAG (op, FLAG_REMOVED); |
1279 | |
1251 | |
1280 | op->map = m; |
1252 | op->map = m; |
1281 | mapspace &ms = op->ms (); |
1253 | mapspace &ms = op->ms (); |
1282 | |
1254 | |
1283 | /* this has to be done after we translate the coordinates. |
1255 | /* this has to be done after we translate the coordinates. |
… | |
… | |
1424 | op->map->touch (); |
1396 | op->map->touch (); |
1425 | } |
1397 | } |
1426 | |
1398 | |
1427 | op->map->dirty = true; |
1399 | op->map->dirty = true; |
1428 | |
1400 | |
1429 | /* If we have a floor, we know the player, if any, will be above |
|
|
1430 | * it, so save a few ticks and start from there. |
|
|
1431 | */ |
|
|
1432 | if (!(flag & INS_MAP_LOAD)) |
1401 | if (!(flag & INS_MAP_LOAD)) |
1433 | if (object *pl = ms.player ()) |
1402 | if (object *pl = ms.player ()) |
1434 | if (pl->contr->ns) |
|
|
1435 | pl->contr->ns->floorbox_update (); |
1403 | pl->contr->ns->floorbox_update (); |
1436 | |
1404 | |
1437 | /* If this object glows, it may affect lighting conditions that are |
1405 | /* If this object glows, it may affect lighting conditions that are |
1438 | * visible to others on this map. But update_all_los is really |
1406 | * visible to others on this map. But update_all_los is really |
1439 | * an inefficient way to do this, as it means los for all players |
1407 | * an inefficient way to do this, as it means los for all players |
1440 | * on the map will get recalculated. The players could very well |
1408 | * on the map will get recalculated. The players could very well |
… | |
… | |
1678 | * be != op, if items are merged. -Tero |
1646 | * be != op, if items are merged. -Tero |
1679 | */ |
1647 | */ |
1680 | object * |
1648 | object * |
1681 | object::insert (object *op) |
1649 | object::insert (object *op) |
1682 | { |
1650 | { |
1683 | object *tmp, *otmp; |
|
|
1684 | |
|
|
1685 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1651 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1686 | op->remove (); |
1652 | op->remove (); |
1687 | |
1653 | |
1688 | if (op->more) |
1654 | if (op->more) |
1689 | { |
1655 | { |
… | |
… | |
1691 | return op; |
1657 | return op; |
1692 | } |
1658 | } |
1693 | |
1659 | |
1694 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1660 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1695 | CLEAR_FLAG (op, FLAG_REMOVED); |
1661 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
1662 | |
1696 | if (op->nrof) |
1663 | if (op->nrof) |
1697 | { |
1664 | { |
1698 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1665 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1699 | if (object::can_merge (tmp, op)) |
1666 | if (object::can_merge (tmp, op)) |
1700 | { |
1667 | { |
1701 | /* return the original object and remove inserted object |
1668 | /* return the original object and remove inserted object |
1702 | (client needs the original object) */ |
1669 | (client needs the original object) */ |
1703 | tmp->nrof += op->nrof; |
1670 | tmp->nrof += op->nrof; |
… | |
… | |
1722 | add_weight (this, op->weight * op->nrof); |
1689 | add_weight (this, op->weight * op->nrof); |
1723 | } |
1690 | } |
1724 | else |
1691 | else |
1725 | add_weight (this, (op->weight + op->carrying)); |
1692 | add_weight (this, (op->weight + op->carrying)); |
1726 | |
1693 | |
1727 | otmp = this->in_player (); |
1694 | if (object *otmp = this->in_player ()) |
1728 | if (otmp && otmp->contr) |
|
|
1729 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1695 | if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1730 | otmp->update_stats (); |
1696 | otmp->update_stats (); |
1731 | |
1697 | |
|
|
1698 | op->owner = 0; // its his/hers now. period. |
1732 | op->map = 0; |
1699 | op->map = 0; |
1733 | op->env = this; |
1700 | op->env = this; |
1734 | op->above = 0; |
1701 | op->above = 0; |
1735 | op->below = 0; |
1702 | op->below = 0; |
1736 | op->x = 0, op->y = 0; |
1703 | op->x = op->y = 0; |
1737 | |
1704 | |
1738 | /* reset the light list and los of the players on the map */ |
1705 | /* reset the light list and los of the players on the map */ |
1739 | if ((op->glow_radius != 0) && map) |
1706 | if (op->glow_radius && map) |
1740 | { |
1707 | { |
1741 | #ifdef DEBUG_LIGHTS |
1708 | #ifdef DEBUG_LIGHTS |
1742 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1709 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1743 | #endif /* DEBUG_LIGHTS */ |
1710 | #endif /* DEBUG_LIGHTS */ |
1744 | if (map->darkness) |
1711 | if (map->darkness) |
… | |
… | |
2029 | int index = 0, flag; |
1996 | int index = 0, flag; |
2030 | int altern[SIZEOFFREE]; |
1997 | int altern[SIZEOFFREE]; |
2031 | |
1998 | |
2032 | for (int i = start; i < stop; i++) |
1999 | for (int i = start; i < stop; i++) |
2033 | { |
2000 | { |
2034 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
2001 | mapxy pos (m, x, y); pos.move (i); |
2035 | if (!flag) |
2002 | |
2036 | altern [index++] = i; |
2003 | if (!pos.normalise ()) |
|
|
2004 | continue; |
|
|
2005 | |
|
|
2006 | mapspace &ms = *pos; |
|
|
2007 | ms.update (); |
|
|
2008 | |
|
|
2009 | /* However, often |
|
|
2010 | * ob doesn't have any move type (when used to place exits) |
|
|
2011 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
|
|
2012 | */ |
|
|
2013 | if (ob->move_type == 0 && ms.move_block != MOVE_ALL) |
|
|
2014 | continue; |
2037 | |
2015 | |
2038 | /* Basically, if we find a wall on a space, we cut down the search size. |
2016 | /* Basically, if we find a wall on a space, we cut down the search size. |
2039 | * In this way, we won't return spaces that are on another side of a wall. |
2017 | * In this way, we won't return spaces that are on another side of a wall. |
2040 | * This mostly work, but it cuts down the search size in all directions - |
2018 | * This mostly work, but it cuts down the search size in all directions - |
2041 | * if the space being examined only has a wall to the north and empty |
2019 | * if the space being examined only has a wall to the north and empty |
2042 | * spaces in all the other directions, this will reduce the search space |
2020 | * spaces in all the other directions, this will reduce the search space |
2043 | * to only the spaces immediately surrounding the target area, and |
2021 | * to only the spaces immediately surrounding the target area, and |
2044 | * won't look 2 spaces south of the target space. |
2022 | * won't look 2 spaces south of the target space. |
2045 | */ |
2023 | */ |
2046 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2024 | if (ms.move_block == MOVE_ALL && maxfree[i] < stop) |
|
|
2025 | { |
2047 | stop = maxfree[i]; |
2026 | stop = maxfree[i]; |
|
|
2027 | continue; |
|
|
2028 | } |
|
|
2029 | |
|
|
2030 | /* Note it is intentional that we check ob - the movement type of the |
|
|
2031 | * head of the object should correspond for the entire object. |
|
|
2032 | */ |
|
|
2033 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
|
|
2034 | continue; |
|
|
2035 | |
|
|
2036 | altern [index++] = i; |
2048 | } |
2037 | } |
2049 | |
2038 | |
2050 | if (!index) |
2039 | if (!index) |
2051 | return -1; |
2040 | return -1; |
2052 | |
2041 | |
… | |
… | |
2061 | */ |
2050 | */ |
2062 | int |
2051 | int |
2063 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2052 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2064 | { |
2053 | { |
2065 | for (int i = 0; i < SIZEOFFREE; i++) |
2054 | for (int i = 0; i < SIZEOFFREE; i++) |
2066 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2055 | if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i])) |
2067 | return i; |
2056 | return i; |
2068 | |
2057 | |
2069 | return -1; |
2058 | return -1; |
2070 | } |
2059 | } |
2071 | |
2060 | |
… | |
… | |
2348 | * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause |
2337 | * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause |
2349 | * core dumps if they do. |
2338 | * core dumps if they do. |
2350 | * |
2339 | * |
2351 | * Add a check so we can't pick up invisible objects (0.93.8) |
2340 | * Add a check so we can't pick up invisible objects (0.93.8) |
2352 | */ |
2341 | */ |
2353 | |
|
|
2354 | int |
2342 | int |
2355 | can_pick (const object *who, const object *item) |
2343 | can_pick (const object *who, const object *item) |
2356 | { |
2344 | { |
2357 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2345 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2358 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2346 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
… | |
… | |
2616 | &name, |
2604 | &name, |
2617 | title ? "\",title:\"" : "", |
2605 | title ? "\",title:\"" : "", |
2618 | title ? (const char *)title : "", |
2606 | title ? (const char *)title : "", |
2619 | flag_desc (flagdesc, 512), type); |
2607 | flag_desc (flagdesc, 512), type); |
2620 | |
2608 | |
2621 | if (env) |
2609 | if (!this->flag[FLAG_REMOVED] && env) |
2622 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2610 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2623 | |
2611 | |
2624 | if (map) |
2612 | if (map) |
2625 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2613 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2626 | |
2614 | |
… | |
… | |
2673 | old_container->flag [FLAG_APPLIED] = 0; |
2661 | old_container->flag [FLAG_APPLIED] = 0; |
2674 | container = 0; |
2662 | container = 0; |
2675 | |
2663 | |
2676 | esrv_update_item (UPD_FLAGS, this, old_container); |
2664 | esrv_update_item (UPD_FLAGS, this, old_container); |
2677 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2665 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
|
|
2666 | play_sound (sound_find ("chest_close")); |
2678 | } |
2667 | } |
2679 | |
2668 | |
2680 | if (new_container) |
2669 | if (new_container) |
2681 | { |
2670 | { |
2682 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
2671 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
… | |
… | |
2698 | new_container->flag [FLAG_APPLIED] = 1; |
2687 | new_container->flag [FLAG_APPLIED] = 1; |
2699 | container = new_container; |
2688 | container = new_container; |
2700 | |
2689 | |
2701 | esrv_update_item (UPD_FLAGS, this, new_container); |
2690 | esrv_update_item (UPD_FLAGS, this, new_container); |
2702 | esrv_send_inventory (this, new_container); |
2691 | esrv_send_inventory (this, new_container); |
|
|
2692 | play_sound (sound_find ("chest_open")); |
2703 | } |
2693 | } |
2704 | } |
2694 | } |
2705 | |
2695 | |
2706 | object * |
2696 | object * |
2707 | object::force_find (const shstr name) |
2697 | object::force_find (const shstr name) |
… | |
… | |
2733 | force->flag [FLAG_APPLIED] = true; |
2723 | force->flag [FLAG_APPLIED] = true; |
2734 | |
2724 | |
2735 | insert (force); |
2725 | insert (force); |
2736 | } |
2726 | } |
2737 | |
2727 | |
|
|
2728 | void |
|
|
2729 | object::play_sound (faceidx sound) const |
|
|
2730 | { |
|
|
2731 | if (!sound) |
|
|
2732 | return; |
|
|
2733 | |
|
|
2734 | if (flag [FLAG_REMOVED]) |
|
|
2735 | return; |
|
|
2736 | |
|
|
2737 | if (env) |
|
|
2738 | { |
|
|
2739 | if (object *pl = in_player ()) |
|
|
2740 | pl->contr->play_sound (sound); |
|
|
2741 | } |
|
|
2742 | else |
|
|
2743 | map->play_sound (sound, x, y); |
|
|
2744 | } |
|
|
2745 | |