… | |
… | |
1089 | if (map->in_memory == MAP_SAVING) |
1089 | if (map->in_memory == MAP_SAVING) |
1090 | return; |
1090 | return; |
1091 | |
1091 | |
1092 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1092 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1093 | |
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 | |
1094 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1106 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1095 | { |
1107 | { |
1096 | /* 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 |
1097 | * being removed. |
1109 | * being removed. |
1098 | */ |
1110 | */ |
1099 | |
|
|
1100 | if (tmp->type == PLAYER && tmp->container == this) |
|
|
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 | tmp->close_container (); |
|
|
1106 | |
1111 | |
1107 | /* See if object moving off should effect something */ |
1112 | /* See if object moving off should effect something */ |
1108 | if (check_walk_off |
1113 | if (check_walk_off |
1109 | && ((move_type & tmp->move_off) |
1114 | && ((move_type & tmp->move_off) |
1110 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1115 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
… | |
… | |
1233 | |
1238 | |
1234 | object *top, *floor = NULL; |
1239 | object *top, *floor = NULL; |
1235 | |
1240 | |
1236 | op->remove (); |
1241 | op->remove (); |
1237 | |
1242 | |
1238 | #if 0 |
|
|
1239 | if (!m->active != !op->active) |
|
|
1240 | if (m->active) |
|
|
1241 | op->activate_recursive (); |
|
|
1242 | else |
|
|
1243 | op->deactivate_recursive (); |
|
|
1244 | #endif |
|
|
1245 | |
|
|
1246 | if (out_of_map (m, op->x, op->y)) |
1243 | if (out_of_map (m, op->x, op->y)) |
1247 | { |
1244 | { |
1248 | 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 ()); |
1249 | #ifdef MANY_CORES |
1246 | #ifdef MANY_CORES |
1250 | /* 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 |
… | |
… | |
1421 | /* If we have a floor, we know the player, if any, will be above |
1418 | /* If we have a floor, we know the player, if any, will be above |
1422 | * it, so save a few ticks and start from there. |
1419 | * it, so save a few ticks and start from there. |
1423 | */ |
1420 | */ |
1424 | if (!(flag & INS_MAP_LOAD)) |
1421 | if (!(flag & INS_MAP_LOAD)) |
1425 | if (object *pl = ms.player ()) |
1422 | if (object *pl = ms.player ()) |
1426 | if (pl->contr->ns) |
|
|
1427 | pl->contr->ns->floorbox_update (); |
1423 | pl->contr->ns->floorbox_update (); |
1428 | |
1424 | |
1429 | /* If this object glows, it may affect lighting conditions that are |
1425 | /* If this object glows, it may affect lighting conditions that are |
1430 | * visible to others on this map. But update_all_los is really |
1426 | * visible to others on this map. But update_all_los is really |
1431 | * an inefficient way to do this, as it means los for all players |
1427 | * an inefficient way to do this, as it means los for all players |
1432 | * on the map will get recalculated. The players could very well |
1428 | * on the map will get recalculated. The players could very well |
… | |
… | |
2340 | * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause |
2336 | * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause |
2341 | * core dumps if they do. |
2337 | * core dumps if they do. |
2342 | * |
2338 | * |
2343 | * Add a check so we can't pick up invisible objects (0.93.8) |
2339 | * Add a check so we can't pick up invisible objects (0.93.8) |
2344 | */ |
2340 | */ |
2345 | |
|
|
2346 | int |
2341 | int |
2347 | can_pick (const object *who, const object *item) |
2342 | can_pick (const object *who, const object *item) |
2348 | { |
2343 | { |
2349 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2344 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2350 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2345 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
… | |
… | |
2665 | old_container->flag [FLAG_APPLIED] = 0; |
2660 | old_container->flag [FLAG_APPLIED] = 0; |
2666 | container = 0; |
2661 | container = 0; |
2667 | |
2662 | |
2668 | esrv_update_item (UPD_FLAGS, this, old_container); |
2663 | esrv_update_item (UPD_FLAGS, this, old_container); |
2669 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2664 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
|
|
2665 | play_sound (sound_find ("chest_close")); |
2670 | } |
2666 | } |
2671 | |
2667 | |
2672 | if (new_container) |
2668 | if (new_container) |
2673 | { |
2669 | { |
2674 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
2670 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
… | |
… | |
2690 | new_container->flag [FLAG_APPLIED] = 1; |
2686 | new_container->flag [FLAG_APPLIED] = 1; |
2691 | container = new_container; |
2687 | container = new_container; |
2692 | |
2688 | |
2693 | esrv_update_item (UPD_FLAGS, this, new_container); |
2689 | esrv_update_item (UPD_FLAGS, this, new_container); |
2694 | esrv_send_inventory (this, new_container); |
2690 | esrv_send_inventory (this, new_container); |
|
|
2691 | play_sound (sound_find ("chest_open")); |
2695 | } |
2692 | } |
2696 | } |
2693 | } |
2697 | |
2694 | |
2698 | object * |
2695 | object * |
2699 | object::force_find (const shstr name) |
2696 | object::force_find (const shstr name) |
… | |
… | |
2725 | force->flag [FLAG_APPLIED] = true; |
2722 | force->flag [FLAG_APPLIED] = true; |
2726 | |
2723 | |
2727 | insert (force); |
2724 | insert (force); |
2728 | } |
2725 | } |
2729 | |
2726 | |
|
|
2727 | void |
|
|
2728 | object::play_sound (faceidx sound) const |
|
|
2729 | { |
|
|
2730 | if (!sound) |
|
|
2731 | return; |
|
|
2732 | |
|
|
2733 | if (flag [FLAG_REMOVED]) |
|
|
2734 | return; |
|
|
2735 | |
|
|
2736 | if (env) |
|
|
2737 | { |
|
|
2738 | if (object *pl = in_player ()) |
|
|
2739 | pl->contr->play_sound (sound); |
|
|
2740 | } |
|
|
2741 | else |
|
|
2742 | map->play_sound (sound, x, y); |
|
|
2743 | } |
|
|
2744 | |