… | |
… | |
299 | return 0; |
299 | return 0; |
300 | else if (!compare_ob_value_lists (ob1, ob2)) |
300 | else if (!compare_ob_value_lists (ob1, ob2)) |
301 | return 0; |
301 | return 0; |
302 | } |
302 | } |
303 | |
303 | |
304 | //TODO: generate an event or call into perl for additional checks |
|
|
305 | if (ob1->self || ob2->self) |
304 | if (ob1->self || ob2->self) |
306 | { |
305 | { |
307 | ob1->optimise (); |
306 | ob1->optimise (); |
308 | ob2->optimise (); |
307 | ob2->optimise (); |
309 | |
308 | |
310 | if (ob1->self || ob2->self) |
309 | if (ob1->self || ob2->self) |
|
|
310 | if (!cfperl_can_merge (ob1, ob2)) |
311 | return 0; |
311 | return 0; |
312 | } |
312 | } |
313 | |
313 | |
314 | /* Everything passes, must be OK. */ |
314 | /* Everything passes, must be OK. */ |
315 | return 1; |
315 | return 1; |
316 | } |
316 | } |
… | |
… | |
960 | return; |
960 | return; |
961 | |
961 | |
962 | if (destroy_inventory) |
962 | if (destroy_inventory) |
963 | destroy_inv (false); |
963 | destroy_inv (false); |
964 | |
964 | |
|
|
965 | if (is_head ()) |
|
|
966 | if (sound_destroy) |
|
|
967 | play_sound (sound_destroy); |
|
|
968 | else if (flag [FLAG_MONSTER]) |
|
|
969 | play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism |
|
|
970 | |
965 | attachable::destroy (); |
971 | attachable::destroy (); |
966 | } |
972 | } |
967 | |
973 | |
968 | /* |
974 | /* |
969 | * sub_weight() recursively (outwards) subtracts a number from the |
975 | * sub_weight() recursively (outwards) subtracts a number from the |
… | |
… | |
1083 | if (map->in_memory == MAP_SAVING) |
1089 | if (map->in_memory == MAP_SAVING) |
1084 | return; |
1090 | return; |
1085 | |
1091 | |
1086 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1092 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1087 | |
1093 | |
|
|
1094 | if (object *pl = ms.player ()) |
|
|
1095 | { |
|
|
1096 | if (pl->container == this) |
|
|
1097 | /* If a container that the player is currently using somehow gets |
|
|
1098 | * removed (most likely destroyed), update the player view |
|
|
1099 | * appropriately. |
|
|
1100 | */ |
|
|
1101 | pl->close_container (); |
|
|
1102 | |
|
|
1103 | pl->contr->ns->floorbox_update (); |
|
|
1104 | } |
|
|
1105 | |
1088 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1106 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1089 | { |
1107 | { |
1090 | /* No point updating the players look faces if he is the object |
1108 | /* No point updating the players look faces if he is the object |
1091 | * being removed. |
1109 | * being removed. |
1092 | */ |
1110 | */ |
1093 | |
|
|
1094 | if (tmp->type == PLAYER && tmp != this) |
|
|
1095 | { |
|
|
1096 | /* If a container that the player is currently using somehow gets |
|
|
1097 | * removed (most likely destroyed), update the player view |
|
|
1098 | * appropriately. |
|
|
1099 | */ |
|
|
1100 | if (tmp->container == this) |
|
|
1101 | { |
|
|
1102 | flag [FLAG_APPLIED] = 0; |
|
|
1103 | tmp->container = 0; |
|
|
1104 | } |
|
|
1105 | |
|
|
1106 | if (tmp->contr->ns) |
|
|
1107 | tmp->contr->ns->floorbox_update (); |
|
|
1108 | } |
|
|
1109 | |
1111 | |
1110 | /* See if object moving off should effect something */ |
1112 | /* See if object moving off should effect something */ |
1111 | if (check_walk_off |
1113 | if (check_walk_off |
1112 | && ((move_type & tmp->move_off) |
1114 | && ((move_type & tmp->move_off) |
1113 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1115 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
… | |
… | |
1236 | |
1238 | |
1237 | object *top, *floor = NULL; |
1239 | object *top, *floor = NULL; |
1238 | |
1240 | |
1239 | op->remove (); |
1241 | op->remove (); |
1240 | |
1242 | |
1241 | #if 0 |
|
|
1242 | if (!m->active != !op->active) |
|
|
1243 | if (m->active) |
|
|
1244 | op->activate_recursive (); |
|
|
1245 | else |
|
|
1246 | op->deactivate_recursive (); |
|
|
1247 | #endif |
|
|
1248 | |
|
|
1249 | if (out_of_map (m, op->x, op->y)) |
1243 | if (out_of_map (m, op->x, op->y)) |
1250 | { |
1244 | { |
1251 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); |
1245 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); |
1252 | #ifdef MANY_CORES |
1246 | #ifdef MANY_CORES |
1253 | /* Better to catch this here, as otherwise the next use of this object |
1247 | /* Better to catch this here, as otherwise the next use of this object |
… | |
… | |
1375 | */ |
1369 | */ |
1376 | if (last && last->below && last != floor) |
1370 | if (last && last->below && last != floor) |
1377 | top = last->below; |
1371 | top = last->below; |
1378 | } |
1372 | } |
1379 | } /* If objects on this space */ |
1373 | } /* If objects on this space */ |
1380 | |
|
|
1381 | if (flag & INS_MAP_LOAD) |
1374 | if (flag & INS_MAP_LOAD) |
1382 | top = ms.top; |
1375 | top = ms.top; |
1383 | |
1376 | |
1384 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1377 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1385 | top = floor; |
1378 | top = floor; |
… | |
… | |
1420 | op->map->touch (); |
1413 | op->map->touch (); |
1421 | } |
1414 | } |
1422 | |
1415 | |
1423 | op->map->dirty = true; |
1416 | op->map->dirty = true; |
1424 | |
1417 | |
1425 | /* If we have a floor, we know the player, if any, will be above |
|
|
1426 | * it, so save a few ticks and start from there. |
|
|
1427 | */ |
|
|
1428 | if (!(flag & INS_MAP_LOAD)) |
1418 | if (!(flag & INS_MAP_LOAD)) |
1429 | if (object *pl = ms.player ()) |
1419 | if (object *pl = ms.player ()) |
1430 | if (pl->contr->ns) |
|
|
1431 | pl->contr->ns->floorbox_update (); |
1420 | pl->contr->ns->floorbox_update (); |
1432 | |
1421 | |
1433 | /* If this object glows, it may affect lighting conditions that are |
1422 | /* If this object glows, it may affect lighting conditions that are |
1434 | * visible to others on this map. But update_all_los is really |
1423 | * visible to others on this map. But update_all_los is really |
1435 | * an inefficient way to do this, as it means los for all players |
1424 | * an inefficient way to do this, as it means los for all players |
1436 | * on the map will get recalculated. The players could very well |
1425 | * on the map will get recalculated. The players could very well |
… | |
… | |
1674 | * be != op, if items are merged. -Tero |
1663 | * be != op, if items are merged. -Tero |
1675 | */ |
1664 | */ |
1676 | object * |
1665 | object * |
1677 | object::insert (object *op) |
1666 | object::insert (object *op) |
1678 | { |
1667 | { |
1679 | object *tmp, *otmp; |
|
|
1680 | |
|
|
1681 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1668 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1682 | op->remove (); |
1669 | op->remove (); |
1683 | |
1670 | |
1684 | if (op->more) |
1671 | if (op->more) |
1685 | { |
1672 | { |
… | |
… | |
1687 | return op; |
1674 | return op; |
1688 | } |
1675 | } |
1689 | |
1676 | |
1690 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1677 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1691 | CLEAR_FLAG (op, FLAG_REMOVED); |
1678 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
1679 | |
1692 | if (op->nrof) |
1680 | if (op->nrof) |
1693 | { |
1681 | { |
1694 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1682 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1695 | if (object::can_merge (tmp, op)) |
1683 | if (object::can_merge (tmp, op)) |
1696 | { |
1684 | { |
1697 | /* return the original object and remove inserted object |
1685 | /* return the original object and remove inserted object |
1698 | (client needs the original object) */ |
1686 | (client needs the original object) */ |
1699 | tmp->nrof += op->nrof; |
1687 | tmp->nrof += op->nrof; |
… | |
… | |
1718 | add_weight (this, op->weight * op->nrof); |
1706 | add_weight (this, op->weight * op->nrof); |
1719 | } |
1707 | } |
1720 | else |
1708 | else |
1721 | add_weight (this, (op->weight + op->carrying)); |
1709 | add_weight (this, (op->weight + op->carrying)); |
1722 | |
1710 | |
1723 | otmp = this->in_player (); |
1711 | if (object *otmp = this->in_player ()) |
1724 | if (otmp && otmp->contr) |
|
|
1725 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1712 | if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1726 | otmp->update_stats (); |
1713 | otmp->update_stats (); |
1727 | |
1714 | |
|
|
1715 | op->owner = 0; // its his/hers now. period. |
1728 | op->map = 0; |
1716 | op->map = 0; |
1729 | op->env = this; |
1717 | op->env = this; |
1730 | op->above = 0; |
1718 | op->above = 0; |
1731 | op->below = 0; |
1719 | op->below = 0; |
1732 | op->x = 0, op->y = 0; |
1720 | op->x = op->y = 0; |
1733 | |
1721 | |
1734 | /* reset the light list and los of the players on the map */ |
1722 | /* reset the light list and los of the players on the map */ |
1735 | if ((op->glow_radius != 0) && map) |
1723 | if (op->glow_radius && map) |
1736 | { |
1724 | { |
1737 | #ifdef DEBUG_LIGHTS |
1725 | #ifdef DEBUG_LIGHTS |
1738 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1726 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1739 | #endif /* DEBUG_LIGHTS */ |
1727 | #endif /* DEBUG_LIGHTS */ |
1740 | if (map->darkness) |
1728 | if (map->darkness) |
… | |
… | |
2344 | * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause |
2332 | * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause |
2345 | * core dumps if they do. |
2333 | * core dumps if they do. |
2346 | * |
2334 | * |
2347 | * Add a check so we can't pick up invisible objects (0.93.8) |
2335 | * Add a check so we can't pick up invisible objects (0.93.8) |
2348 | */ |
2336 | */ |
2349 | |
|
|
2350 | int |
2337 | int |
2351 | can_pick (const object *who, const object *item) |
2338 | can_pick (const object *who, const object *item) |
2352 | { |
2339 | { |
2353 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2340 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2354 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2341 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
… | |
… | |
2612 | &name, |
2599 | &name, |
2613 | title ? "\",title:\"" : "", |
2600 | title ? "\",title:\"" : "", |
2614 | title ? (const char *)title : "", |
2601 | title ? (const char *)title : "", |
2615 | flag_desc (flagdesc, 512), type); |
2602 | flag_desc (flagdesc, 512), type); |
2616 | |
2603 | |
2617 | if (env) |
2604 | if (!this->flag[FLAG_REMOVED] && env) |
2618 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2605 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2619 | |
2606 | |
2620 | if (map) |
2607 | if (map) |
2621 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2608 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2622 | |
2609 | |
… | |
… | |
2640 | } |
2627 | } |
2641 | |
2628 | |
2642 | const materialtype_t * |
2629 | const materialtype_t * |
2643 | object::dominant_material () const |
2630 | object::dominant_material () const |
2644 | { |
2631 | { |
2645 | if (materialtype_t *mat = name_to_material (materialname)) |
2632 | if (materialtype_t *mt = name_to_material (materialname)) |
2646 | return mat; |
2633 | return mt; |
2647 | |
2634 | |
2648 | // omfg this is slow, this has to be temporary :) |
|
|
2649 | shstr unknown ("unknown"); |
|
|
2650 | |
|
|
2651 | return name_to_material (unknown); |
2635 | return name_to_material (shstr_unknown); |
2652 | } |
2636 | } |
2653 | |
2637 | |
2654 | void |
2638 | void |
2655 | object::open_container (object *new_container) |
2639 | object::open_container (object *new_container) |
2656 | { |
2640 | { |
… | |
… | |
2672 | old_container->flag [FLAG_APPLIED] = 0; |
2656 | old_container->flag [FLAG_APPLIED] = 0; |
2673 | container = 0; |
2657 | container = 0; |
2674 | |
2658 | |
2675 | esrv_update_item (UPD_FLAGS, this, old_container); |
2659 | esrv_update_item (UPD_FLAGS, this, old_container); |
2676 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2660 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
|
|
2661 | play_sound (sound_find ("chest_close")); |
2677 | } |
2662 | } |
2678 | |
2663 | |
2679 | if (new_container) |
2664 | if (new_container) |
2680 | { |
2665 | { |
2681 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
2666 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
… | |
… | |
2697 | new_container->flag [FLAG_APPLIED] = 1; |
2682 | new_container->flag [FLAG_APPLIED] = 1; |
2698 | container = new_container; |
2683 | container = new_container; |
2699 | |
2684 | |
2700 | esrv_update_item (UPD_FLAGS, this, new_container); |
2685 | esrv_update_item (UPD_FLAGS, this, new_container); |
2701 | esrv_send_inventory (this, new_container); |
2686 | esrv_send_inventory (this, new_container); |
|
|
2687 | play_sound (sound_find ("chest_open")); |
|
|
2688 | } |
|
|
2689 | } |
|
|
2690 | |
|
|
2691 | object * |
|
|
2692 | object::force_find (const shstr name) |
|
|
2693 | { |
|
|
2694 | /* cycle through his inventory to look for the MARK we want to |
|
|
2695 | * place |
|
|
2696 | */ |
|
|
2697 | for (object *tmp = inv; tmp; tmp = tmp->below) |
|
|
2698 | if (tmp->type == FORCE && tmp->slaying == name) |
|
|
2699 | return splay (tmp); |
|
|
2700 | |
|
|
2701 | return 0; |
|
|
2702 | } |
|
|
2703 | |
|
|
2704 | void |
|
|
2705 | object::force_add (const shstr name, int duration) |
|
|
2706 | { |
|
|
2707 | if (object *force = force_find (name)) |
|
|
2708 | force->destroy (); |
|
|
2709 | |
|
|
2710 | object *force = get_archetype (FORCE_NAME); |
|
|
2711 | |
|
|
2712 | force->slaying = name; |
|
|
2713 | force->stats.food = 1; |
|
|
2714 | force->speed_left = -1.f; |
|
|
2715 | |
|
|
2716 | force->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2717 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2718 | force->flag [FLAG_APPLIED] = true; |
|
|
2719 | |
|
|
2720 | insert (force); |
|
|
2721 | } |
|
|
2722 | |
|
|
2723 | void |
|
|
2724 | object::play_sound (faceidx sound) const |
|
|
2725 | { |
|
|
2726 | if (!sound) |
|
|
2727 | return; |
|
|
2728 | |
|
|
2729 | if (flag [FLAG_REMOVED]) |
|
|
2730 | return; |
|
|
2731 | |
|
|
2732 | if (env) |
2702 | } |
2733 | { |
|
|
2734 | if (object *pl = in_player ()) |
|
|
2735 | pl->contr->play_sound (sound); |
|
|
2736 | } |
|
|
2737 | else |
|
|
2738 | map->play_sound (sound, x, y); |
2703 | } |
2739 | } |
2704 | |
2740 | |
2705 | |
|
|